clean up integration test pom file (apache#11817)

soumitra-st · Oct 17, 2023 · d8315c6 · d8315c6
1 parent 7247da8
commit d8315c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 64 deletions.
diff --git a/.github/workflows/scripts/pr-tests/.pinot_tests_build.sh b/.github/workflows/scripts/pr-tests/.pinot_tests_build.sh
@@ -40,7 +40,7 @@ else
     mvn clean install \
       -DskipTests -Dcheckstyle.skip -Dspotless.skip -Denforcer.skip -Dlicense.skip -Dmaven.plugin.appassembler.skip=true \
       -am -B -T 16 \
-      -P github-actions,no-integration-tests \
+      -P github-actions \
       -pl 'pinot-spi' \
       -pl 'pinot-segment-spi' \
       -pl 'pinot-common' \
@@ -53,7 +53,7 @@ else
     mvn clean install \
       -DskipTests -Dcheckstyle.skip -Dspotless.skip -Denforcer.skip -Dlicense.skip -Dmaven.plugin.appassembler.skip=true \
       -am -B -T 16 \
-      -P github-actions,no-integration-tests \
+      -P github-actions \
       -pl '!pinot-integration-test-base' \
       -pl '!pinot-integration-tests' \
       -pl '!pinot-perf' \

diff --git a/.github/workflows/scripts/pr-tests/.pinot_tests_unit.sh b/.github/workflows/scripts/pr-tests/.pinot_tests_unit.sh
@@ -37,7 +37,7 @@ if [ "$RUN_TEST_SET" == "1" ]; then
       -pl 'pinot-core' \
       -pl 'pinot-query-planner' \
       -pl 'pinot-query-runtime' \
-      -P github-actions,no-integration-tests || exit 1
+      -P github-actions || exit 1
 fi
 if [ "$RUN_TEST_SET" == "2" ]; then
   mvn test \
@@ -48,5 +48,5 @@ if [ "$RUN_TEST_SET" == "2" ]; then
     -pl '!pinot-core' \
     -pl '!pinot-query-planner' \
     -pl '!pinot-query-runtime' \
-    -P github-actions,no-integration-tests || exit 1
+    -P github-actions || exit 1
 fi
diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
@@ -62,31 +62,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>integration-tests-only</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>false</skipTests>
-              <excludes>
-                <!-- Covered by FlakyConsumerRealtimeClusterIntegrationTest -->
-                <exclude>**/RealtimeClusterIntegrationTest.java</exclude>
-                <!-- Covered by ConvertToRawIndexMinionClusterIntegrationTest -->
-                <exclude>**/HybridClusterIntegrationTest.java</exclude>
-                <!-- Covered by TlsIntegrationTest -->
-                <exclude>**/BasicAuthRealtimeIntegrationTest.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>integration-tests-set-1</id>
       <activation>
@@ -139,12 +114,14 @@
                 <include>**/org/apache/pinot/integration/tests/R*Test.java</include>
                 <include>**/org/apache/pinot/integration/tests/S*Test.java</include>
                 <include>**/org/apache/pinot/integration/tests/T*Test.java</include>
+                <include>**/org/apache/pinot/integration/tests/tpch/*Test.java</include>
                 <include>**/org/apache/pinot/integration/tests/U*Test.java</include>
                 <include>**/org/apache/pinot/integration/tests/V*Test.java</include>
                 <include>**/org/apache/pinot/integration/tests/W*Test.java</include>
                 <include>**/org/apache/pinot/integration/tests/X*Test.java</include>
                 <include>**/org/apache/pinot/integration/tests/Y*Test.java</include>
                 <include>**/org/apache/pinot/integration/tests/Z*Test.java</include>
+                <include>**/org/apache/pinot/server/realtime/**</include>
               </includes>
             </configuration>
           </plugin>
@@ -171,23 +148,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>no-integration-tests</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>true</skipTests>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -212,24 +212,6 @@
         <argLine>-Xms4g -Xmx4g -Dlog4j2.configurationFile=log4j2.xml</argLine>
       </properties>
     </profile>
-    <!-- jfim: this profile is overridden in pinot-integration-tests -->
-    <profile>
-      <id>integration-tests-only</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>true</skipTests>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <!-- Disable source release assembly for 'apache-release' profile. -->
     <profile>
       <id>apache-release</id>
@@ -1769,6 +1751,7 @@
           </execution>
         </executions>
         <configuration>
+          <append>true</append>
           <includes>
             <include>org/apache/pinot/**/*</include>
           </includes>