You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2024/01/31 11:42:51 UTC
(flink) 07/08: [FLINK-27082][ci] Updates github-actions profile.
This is an automated email from the ASF dual-hosted git repository.
mapohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit a810088688c7fe1bc969ed99aed3aaaf73742449
Author: Matthias Pohl <ma...@aiven.io>
AuthorDate: Fri Jan 5 15:48:03 2024 +0100
[FLINK-27082][ci] Updates github-actions profile.
A dedicated github-actions profile doesn't work if other profiles which configure excludeGroups for the surefire plugin are enabled.
---
pom.xml | 46 ++++++++++++++++++++++++++++++++++++++--------
1 file changed, 38 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index f7de4a97b5b..9c20d806d77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,6 +204,10 @@ under the License.
of entries in the form '[-]{2}add-[opens|exports]=<module>/<package>=ALL-UNNAMED'.-->
<surefire.module.config/>
+ <surefire.excludedGroups.github-actions/>
+ <surefire.excludedGroups.adaptive-scheduler/>
+ <surefire.excludedGroups.jdk/>
+
<!-- Can be set to any value to reproduce a specific build. -->
<test.randomization.seed/>
<test.unit.pattern>**/*Test.*</test.unit.pattern>
@@ -1000,6 +1004,9 @@ under the License.
<profile>
<id>enable-adaptive-scheduler</id>
+ <properties>
+ <surefire.excludedGroups.adaptive-scheduler>org.apache.flink.testutils.junit.FailsWithAdaptiveScheduler</surefire.excludedGroups.adaptive-scheduler>
+ </properties>
<build>
<plugins>
<plugin>
@@ -1009,7 +1016,11 @@ under the License.
<systemProperties>
<flink.tests.enable-adaptive-scheduler>true</flink.tests.enable-adaptive-scheduler>
</systemProperties>
- <excludedGroups>org.apache.flink.testutils.junit.FailsWithAdaptiveScheduler</excludedGroups>
+ <excludedGroups>
+ ${surefire.excludedGroups.github-actions},
+ ${surefire.excludedGroups.adaptive-scheduler},
+ ${surefire.excludedGroups.jdk,
+ </excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -1018,7 +1029,9 @@ under the License.
<profile>
<id>github-actions</id>
-
+ <properties>
+ <surefire.excludedGroups.github-actions>org.apache.flink.testutils.junit.FailsInGHAContainerWithRootUser</surefire.excludedGroups.github-actions>
+ </properties>
<build>
<pluginManagement>
<plugins>
@@ -1026,7 +1039,11 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludedGroups>org.apache.flink.testutils.junit.FailsInGHAContainerWithRootUser</excludedGroups>
+ <excludedGroups>
+ ${surefire.excludedGroups.github-actions},
+ ${surefire.excludedGroups.adaptive-scheduler},
+ ${surefire.excludedGroups.jdk},
+ </excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -1040,6 +1057,10 @@ under the License.
<jdk>[11,)</jdk>
</activation>
+ <properties>
+ <surefire.excludedGroups.jdk>org.apache.flink.testutils.junit.FailsOnJava11</surefire.excludedGroups.jdk>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
@@ -1052,7 +1073,11 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludedGroups>org.apache.flink.testutils.junit.FailsOnJava11</excludedGroups>
+ <excludedGroups>
+ ${surefire.excludedGroups.github-actions},
+ ${surefire.excludedGroups.adaptive-scheduler},
+ ${surefire.excludedGroups.jdk},
+ </excludedGroups>
</configuration>
</plugin>
<plugin>
@@ -1101,6 +1126,7 @@ under the License.
<properties>
<!-- Bump Scala because 2.12.7 doesn't compile on Java 17. -->
<scala.version>2.12.15</scala.version>
+ <surefire.excludedGroups.jdk>org.apache.flink.testutils.junit.FailsOnJava17</surefire.excludedGroups.jdk>
</properties>
<build>
@@ -1110,7 +1136,11 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludedGroups>org.apache.flink.testutils.junit.FailsOnJava17</excludedGroups>
+ <excludedGroups>
+ ${surefire.excludedGroups.github-actions},
+ ${surefire.excludedGroups.adaptive-scheduler},
+ ${surefire.excludedGroups.jdk},
+ </excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -1174,9 +1204,9 @@ under the License.
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>
- ${github-actions.surefire.excludedGroups},
- org.apache.flink.testutils.junit.FailsOnJava11,
- org.apache.flink.testutils.junit.FailsOnJava17,
+ ${surefire.excludedGroups.github-actions},
+ ${surefire.excludedGroups.adaptive-scheduler},
+ ${surefire.excludedGroups.jdk},
</excludedGroups>
</configuration>
</plugin>