From f686b728c9453af0fcf206cddff6037a7f29faea Mon Sep 17 00:00:00 2001
From: Igor Bernstein <igorbernstein@google.com>
Date: Mon, 28 Oct 2019 13:51:17 -0400
Subject: [PATCH 1/2] fix: fix maven test configs to make sure admin tests
 don't clobber data tests

---
 google-cloud-bigtable/pom.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index f3d3a965d..a04fd67f6 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -206,8 +206,11 @@
                   <systemPropertyVariables>
                     <bigtable.env>emulator</bigtable.env>
                   </systemPropertyVariables>
-                  <test>com.google.cloud.bigtable.data.v2.it.**</test>
-                  <test>com.google.cloud.bigtable.admin.v2.it.**</test>
+                  <includes>
+                    <include>com.google.cloud.bigtable.data.v2.it.**</include>
+                    <include>com.google.cloud.bigtable.admin.v2.it.**</include>
+                  </includes>
+
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-emulator-it.xml</summaryFile>
                 </configuration>
               </execution>
@@ -234,8 +237,10 @@
                   <systemPropertyVariables>
                     <bigtable.env>prod</bigtable.env>
                   </systemPropertyVariables>
-                  <test>com.google.cloud.bigtable.data.v2.it.**</test>
-                  <test>com.google.cloud.bigtable.admin.v2.it.**</test>
+                  <includes>
+                    <include>com.google.cloud.bigtable.data.v2.it.**</include>
+                    <include>com.google.cloud.bigtable.admin.v2.it.**</include>
+                  </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-prod-it.xml</summaryFile>
                 </configuration>
               </execution>
@@ -268,8 +273,11 @@
                   <environmentVariables>
                     <GOOGLE_CLOUD_ENABLE_DIRECT_PATH>bigtable</GOOGLE_CLOUD_ENABLE_DIRECT_PATH>
                   </environmentVariables>
-                  <!-- TODO(igorbernstein): Once the control plane is accessible via directpath, add admin tests -->
-                  <test>com.google.cloud.bigtable.data.v2.it.**</test>
+                  <includes>
+                    <include>com.google.cloud.bigtable.data.v2.it.**</include>
+                    <!-- TODO(igorbernstein): Once the control plane is accessible via directpath, add admin tests -->
+                    <!-- <include>com.google.cloud.bigtable.admin.v2.it.**</include>-->
+                  </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-directpath-it.xml</summaryFile>
                 </configuration>
               </execution>

From 85a8160fb64674a6465574a823dbbacca2b0ff7b Mon Sep 17 00:00:00 2001
From: Igor Bernstein <igorbernstein@google.com>
Date: Mon, 28 Oct 2019 15:16:46 -0400
Subject: [PATCH 2/2] Update include patterns

---
 google-cloud-bigtable/pom.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index a04fd67f6..5bd659ea7 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -207,10 +207,8 @@
                     <bigtable.env>emulator</bigtable.env>
                   </systemPropertyVariables>
                   <includes>
-                    <include>com.google.cloud.bigtable.data.v2.it.**</include>
-                    <include>com.google.cloud.bigtable.admin.v2.it.**</include>
+                    <include>com.google.cloud.bigtable.**.it.*IT</include>
                   </includes>
-
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-emulator-it.xml</summaryFile>
                 </configuration>
               </execution>
@@ -238,8 +236,7 @@
                     <bigtable.env>prod</bigtable.env>
                   </systemPropertyVariables>
                   <includes>
-                    <include>com.google.cloud.bigtable.data.v2.it.**</include>
-                    <include>com.google.cloud.bigtable.admin.v2.it.**</include>
+                    <include>com.google.cloud.bigtable.**.it.*IT</include>
                   </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-prod-it.xml</summaryFile>
                 </configuration>
@@ -274,9 +271,8 @@
                     <GOOGLE_CLOUD_ENABLE_DIRECT_PATH>bigtable</GOOGLE_CLOUD_ENABLE_DIRECT_PATH>
                   </environmentVariables>
                   <includes>
-                    <include>com.google.cloud.bigtable.data.v2.it.**</include>
                     <!-- TODO(igorbernstein): Once the control plane is accessible via directpath, add admin tests -->
-                    <!-- <include>com.google.cloud.bigtable.admin.v2.it.**</include>-->
+                    <include>com.google.cloud.bigtable.data.v2.it.*IT</include>
                   </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-directpath-it.xml</summaryFile>
                 </configuration>