From 7702baf4b0a49c598f12f0a7d7b8cb43ba902cf7 Mon Sep 17 00:00:00 2001
From: Jiri Pechanec <jpechane@redhat.com>
Date: Fri, 1 Mar 2024 11:30:24 +0100
Subject: [PATCH] [ci] Use unified flaky flag

---
 .github/workflows/cross-maven.yml | 2 +-
 .github/workflows/maven.yml       | 2 +-
 pom.xml                           | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cross-maven.yml b/.github/workflows/cross-maven.yml
index dbf0f9d..bf3e469 100644
--- a/.github/workflows/cross-maven.yml
+++ b/.github/workflows/cross-maven.yml
@@ -69,4 +69,4 @@ jobs:
       - name: Maven build core
         run: ./db2/mvnw clean install -f core/pom.xml -pl debezium-bom,debezium-core,debezium-embedded,debezium-storage -am -DskipTests -DskipITs -Dformat.formatter.goal=validate -Dformat.imports.goal=check -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
       - name: Maven build db2
-        run: ./db2/mvnw clean install -f db2/pom.xml -Passembly -Dformat.formatter.goal=validate -Dformat.imports.goal=check -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dfail.flaky.tests=false
+        run: ./db2/mvnw clean install -f db2/pom.xml -Passembly -Dformat.formatter.goal=validate -Dformat.imports.goal=check -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -DfailFlakyTests=false
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e52be98..53511c9 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,4 +43,4 @@ jobs:
       - name: Maven build core
         run: ./db2/mvnw clean install -f core/pom.xml -pl debezium-bom,debezium-core,debezium-embedded,debezium-storage -am -DskipTests -DskipITs -Dformat.formatter.goal=validate -Dformat.imports.goal=check -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
       - name: Maven build Db2
-        run: ./db2/mvnw clean install -f db2/pom.xml -Passembly -Dformat.formatter.goal=validate -Dformat.imports.goal=check -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dfail.flaky.tests=false
+        run: ./db2/mvnw clean install -f db2/pom.xml -Passembly -Dformat.formatter.goal=validate -Dformat.imports.goal=check -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -DfailFlakyTests=false
diff --git a/pom.xml b/pom.xml
index 42a7982..80f0e63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,9 +42,6 @@
         <apicurio.port>8080</apicurio.port>
         <apicurio.init.timeout>60000</apicurio.init.timeout> <!-- 60 seconds -->
 
-        <!-- Flaky Test Support -->
-        <fail.flaky.tests>true</fail.flaky.tests>
-
         <!-- Order in which Maven Failsafe plugin runs integration tests, the default is in alphabetical order -->
         <runOrder>alphabetical</runOrder>
     </properties>
@@ -342,7 +339,7 @@
                 <configuration>
                     <skipTests>${skipITs}</skipTests>
                     <enableAssertions>true</enableAssertions>
-                    <systemPropertyVariables>
+                    <systemPropertyVariables combine.children="append">
                         <!-- Make these available to the tests via system properties -->
                         <database.hostname>${docker.host.address}</database.hostname>
                         <database.dbname>${db2.dbname}</database.dbname>
@@ -350,7 +347,6 @@
                         <database.user>${db2.user}</database.user>
                         <database.password>${db2.password}</database.password>
                         <skipLongRunningTests>${skipLongRunningTests}</skipLongRunningTests>
-                        <failFlakyTests>${fail.flaky.tests}</failFlakyTests>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>