From e5f53128dda2f1c8b29b9e136c99056eaab0b450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Bobowski?=
<145468486+sfc-gh-mbobowski@users.noreply.github.com>
Date: Fri, 27 Sep 2024 10:34:07 -0700
Subject: [PATCH] SNOW-1692725 Profiles to handle AWS specific tests (#939)
---
pom.xml | 85 ++++++++++++++++++++++++++++-----------
pom_confluent.xml | 85 ++++++++++++++++++++++++++++-----------
test/build_runtime_jar.sh | 4 +-
3 files changed, 126 insertions(+), 48 deletions(-)
diff --git a/pom.xml b/pom.xml
index b3f4b51ce..9f816f636 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,29 +166,6 @@
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.2
-
-
- **/*IT.java
-
-
- none
-
- ${skipIntegrationTests}
-
-
-
-
- integration-test
- verify
-
-
-
-
-
maven-assembly-plugin
3.4.2
@@ -632,6 +609,68 @@
+
+
+ aws
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 2.22.2
+
+
+ **/*IT.java
+
+
+ none
+
+ ${skipIntegrationTests}
+
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+
+
+
+
+ non-aws
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 2.22.2
+
+
+ **/*IT.java
+
+
+ **/*Iceberg*IT.java
+
+ ${skipIntegrationTests}
+
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+
+
+
+
diff --git a/pom_confluent.xml b/pom_confluent.xml
index 8eb4f8529..fbe4d1bc2 100644
--- a/pom_confluent.xml
+++ b/pom_confluent.xml
@@ -324,29 +324,6 @@
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.2
-
-
- **/*IT.java
-
-
- none
-
- ${skipIntegrationTests}
-
-
-
-
- integration-test
- verify
-
-
-
-
-
maven-assembly-plugin
3.4.2
@@ -781,6 +758,68 @@
+
+
+ aws
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 2.22.2
+
+
+ **/*IT.java
+
+
+ none
+
+ ${skipIntegrationTests}
+
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+
+
+
+
+ non-aws
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 2.22.2
+
+
+ **/*IT.java
+
+
+ **/*Iceberg*IT.java
+
+ ${skipIntegrationTests}
+
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+
+
+
+
diff --git a/test/build_runtime_jar.sh b/test/build_runtime_jar.sh
index f92a27b59..3d45ecf79 100755
--- a/test/build_runtime_jar.sh
+++ b/test/build_runtime_jar.sh
@@ -88,10 +88,10 @@ case $BUILD_METHOD in
# skip Iceberg tests outside of AWS
if [[ $BUILD_FOR_CLOUD == "AWS" ]]; then
echo "Running integration tests against AWS cloud"
- mvn -f $POM_FILE_NAME verify -Dgpg.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
+ mvn -f $POM_FILE_NAME verify -Dgpg.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -P aws
else
echo "Running integration tests against non-AWS cloud"
- mvn -f $POM_FILE_NAME verify -Dgpg.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 '-Dtest=!*Iceberg*IT'
+ mvn -f $POM_FILE_NAME verify -Dgpg.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -P non-aws
fi
;;
package)