This is an automated email from the ASF dual-hosted git repository.

swamirishi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new b783c34321 HDDS-11022. Set default test exclusion (#6830)
b783c34321 is described below

commit b783c34321405cb1ee55a025458bae401b5482d9
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jun 18 22:52:21 2024 +0200

    HDDS-11022. Set default test exclusion (#6830)
---
 hadoop-ozone/dev-support/checks/native.sh |  2 +-
 hadoop-ozone/dev-support/checks/unit.sh   |  1 -
 pom.xml                                   | 19 ++++++++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/hadoop-ozone/dev-support/checks/native.sh 
b/hadoop-ozone/dev-support/checks/native.sh
index bdeb138681..b6996d689c 100755
--- a/hadoop-ozone/dev-support/checks/native.sh
+++ b/hadoop-ozone/dev-support/checks/native.sh
@@ -19,5 +19,5 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CHECK=native
 
-source "${DIR}/junit.sh" -Pnative -Drocks_tools_native 
-DexcludedGroups="unhealthy" \
+source "${DIR}/junit.sh" -Pnative -Drocks_tools_native \
   "$@"
diff --git a/hadoop-ozone/dev-support/checks/unit.sh 
b/hadoop-ozone/dev-support/checks/unit.sh
index 8e540fa9e1..09f45795fe 100755
--- a/hadoop-ozone/dev-support/checks/unit.sh
+++ b/hadoop-ozone/dev-support/checks/unit.sh
@@ -18,5 +18,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 
&& pwd )"
 CHECK=unit
 source "${DIR}/junit.sh" \
   -pl \!:ozone-integration-test,\!:mini-chaos-tests \
-  -DexcludedGroups="native | unhealthy" \
   "$@"
diff --git a/pom.xml b/pom.xml
index afd350590a..5c4799dbe8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,7 +241,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xs
     <!-- Plugin versions and config -->
     <maven-surefire-plugin.argLine>-Xmx4096m 
-XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine>
     
<maven-surefire-plugin.argLineAccessArgs></maven-surefire-plugin.argLineAccessArgs>
-    <unstable-test-groups>flaky | native | slow | 
unhealthy</unstable-test-groups>
+    <excluded-test-groups>native | unhealthy</excluded-test-groups> <!-- test 
groups excluded by default (without any manual profile activation) -->
+    <unstable-test-groups>flaky | native | slow | 
unhealthy</unstable-test-groups> <!-- test groups excluded in CI (except in 
dedicated profiles for flaky and native) -->
     <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
     
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
 
@@ -1711,6 +1712,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xs
           <includes>
             <include>**/Test*.java</include>
           </includes>
+          <excludedGroups>${excluded-test-groups}</excludedGroups>
         </configuration>
       </plugin>
       <plugin>
@@ -1965,6 +1967,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xs
         <maven.shade.skip>true</maven.shade.skip>
       </properties>
     </profile>
+    <profile>
+      <!-- @Native tests are excluded by default.  This profile removes the 
exclusion if native build is enabled. -->
+      <id>rocks-native-tests</id>
+      <activation>
+        <property>
+          <name>rocks_tools_native</name>
+        </property>
+      </activation>
+      <properties>
+        <excluded-test-groups>unhealthy</excluded-test-groups>
+      </properties>
+    </profile>
+    <!-- The following profiles define test splits for CI -->
     <profile>
       <id>client</id>
       <build>
@@ -2152,6 +2167,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xs
       </build>
     </profile>
     <profile>
+      <!-- Test split dedicated for running @Flaky tests -->
       <id>flaky</id>
       <build>
         <plugins>
@@ -2167,6 +2183,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xs
       </build>
     </profile>
     <profile>
+      <!-- Test split dedicated for running @Native tests -->
       <id>native</id>
       <build>
         <plugins>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to