From cb8dffb290d447557f389566a7cb22f3d0267851 Mon Sep 17 00:00:00 2001
From: Bing Li <bing.li@snowflake.com>
Date: Wed, 25 Sep 2024 17:37:18 -0700
Subject: [PATCH] update jenkins tests

---
 scripts/jenkins_fips_regress_aws.sh       | 9 +++++++--
 scripts/jenkins_fips_regress_az.sh        | 9 +++++++--
 scripts/jenkins_fips_regress_gcp.sh       | 9 +++++++--
 scripts/jenkins_regress_az.sh             | 9 +++++++--
 scripts/jenkins_regress_az_latest_jdbc.sh | 9 +++++++--
 scripts/jenkins_regress_gcp.sh            | 9 +++++++--
 scripts/jenkins_regress_latest_jdbc.sh    | 9 +++++++--
 7 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/scripts/jenkins_fips_regress_aws.sh b/scripts/jenkins_fips_regress_aws.sh
index 2bee84ab..e67fad07 100755
--- a/scripts/jenkins_fips_regress_aws.sh
+++ b/scripts/jenkins_fips_regress_aws.sh
@@ -18,6 +18,11 @@ exit_code_decorator(){
 gpg --quiet --batch --yes --decrypt --passphrase="$GPG_KEY" --output profile.properties scripts/profile.properties.gpg
 
 
-exit_code_decorator "mvn clean compile"
-exit_code_decorator "mvn -f fips-pom.xml -DargLine=-DFIPS_TEST=true -Dgpg.skip -DtagsToExclude=UnstableTest,com.snowflake.snowpark.PerfTest,SampleDataTest test"
+exit_code_decorator "sbt clean compile"
+exit_code_decorator "sbt JavaAPITests:test"
+exit_code_decorator "sbt SprocTests:test"
+exit_code_decorator "sbt NonparallelTests:test"
+exit_code_decorator "sbt UDFTests:test"
+exit_code_decorator "sbt UDTFTests:test"
+exit_code_decorator "sbt OtherTests:test"
 
diff --git a/scripts/jenkins_fips_regress_az.sh b/scripts/jenkins_fips_regress_az.sh
index dd4d1fbc..ed531ec7 100755
--- a/scripts/jenkins_fips_regress_az.sh
+++ b/scripts/jenkins_fips_regress_az.sh
@@ -17,6 +17,11 @@ exit_code_decorator(){
 # decrypt profile
 gpg --quiet --batch --yes --decrypt --passphrase="$GPG_KEY" --output profile.properties scripts/profile_az.properties.gpg
 
-exit_code_decorator "mvn clean compile"
-exit_code_decorator "mvn -f fips-pom.xml -DargLine=-DFIPS_TEST=true -Dgpg.skip -DtagsToExclude=UnstableTest,com.snowflake.snowpark.PerfTest,SampleDataTest test"
+exit_code_decorator "sbt clean compile"
+exit_code_decorator "sbt JavaAPITests:test"
+exit_code_decorator "sbt SprocTests:test"
+exit_code_decorator "sbt NonparallelTests:test"
+exit_code_decorator "sbt UDFTests:test"
+exit_code_decorator "sbt UDTFTests:test"
+exit_code_decorator "sbt OtherTests:test"
 
diff --git a/scripts/jenkins_fips_regress_gcp.sh b/scripts/jenkins_fips_regress_gcp.sh
index de7084f9..d214a1e4 100755
--- a/scripts/jenkins_fips_regress_gcp.sh
+++ b/scripts/jenkins_fips_regress_gcp.sh
@@ -17,6 +17,11 @@ exit_code_decorator(){
 # decrypt profile
 gpg --quiet --batch --yes --decrypt --passphrase="$GPG_KEY" --output profile.properties scripts/profile_gcp.properties.gpg
 
-exit_code_decorator "mvn clean compile"
-exit_code_decorator "mvn -f fips-pom.xml -DargLine=-DFIPS_TEST=true -Dgpg.skip -DtagsToExclude=UnstableTest,com.snowflake.snowpark.PerfTest,SampleDataTest test"
+exit_code_decorator "sbt clean compile"
+exit_code_decorator "sbt JavaAPITests:test"
+exit_code_decorator "sbt SprocTests:test"
+exit_code_decorator "sbt NonparallelTests:test"
+exit_code_decorator "sbt UDFTests:test"
+exit_code_decorator "sbt UDTFTests:test"
+exit_code_decorator "sbt OtherTests:test"
 
diff --git a/scripts/jenkins_regress_az.sh b/scripts/jenkins_regress_az.sh
index b3141c04..ed531ec7 100755
--- a/scripts/jenkins_regress_az.sh
+++ b/scripts/jenkins_regress_az.sh
@@ -17,6 +17,11 @@ exit_code_decorator(){
 # decrypt profile
 gpg --quiet --batch --yes --decrypt --passphrase="$GPG_KEY" --output profile.properties scripts/profile_az.properties.gpg
 
-exit_code_decorator "mvn clean compile"
-exit_code_decorator "mvn -Dgpg.skip -DtagsToExclude=UnstableTest,com.snowflake.snowpark.PerfTest,SampleDataTest test"
+exit_code_decorator "sbt clean compile"
+exit_code_decorator "sbt JavaAPITests:test"
+exit_code_decorator "sbt SprocTests:test"
+exit_code_decorator "sbt NonparallelTests:test"
+exit_code_decorator "sbt UDFTests:test"
+exit_code_decorator "sbt UDTFTests:test"
+exit_code_decorator "sbt OtherTests:test"
 
diff --git a/scripts/jenkins_regress_az_latest_jdbc.sh b/scripts/jenkins_regress_az_latest_jdbc.sh
index cec8e577..a2046940 100755
--- a/scripts/jenkins_regress_az_latest_jdbc.sh
+++ b/scripts/jenkins_regress_az_latest_jdbc.sh
@@ -40,8 +40,13 @@ build_jdbc
 # skip com.snowflake.snowpark.ReplSuite because classpath are not set well for local jdbc jar
 rm -fr ./src/test/scala/com/snowflake/snowpark/ReplSuite.scala
 
-exit_code_decorator "mvn clean compile"
-exit_code_decorator "mvn -Dgpg.skip -DtagsToExclude=UnstableTest,com.snowflake.snowpark.PerfTest,SampleDataTest test"
+exit_code_decorator "sbt clean compile"
+exit_code_decorator "sbt JavaAPITests:test"
+exit_code_decorator "sbt SprocTests:test"
+exit_code_decorator "sbt NonparallelTests:test"
+exit_code_decorator "sbt UDFTests:test"
+exit_code_decorator "sbt UDTFTests:test"
+exit_code_decorator "sbt OtherTests:test"
 
 # clean up
 rm -fr snowflake-jdbc
diff --git a/scripts/jenkins_regress_gcp.sh b/scripts/jenkins_regress_gcp.sh
index e137d2b3..d214a1e4 100755
--- a/scripts/jenkins_regress_gcp.sh
+++ b/scripts/jenkins_regress_gcp.sh
@@ -17,6 +17,11 @@ exit_code_decorator(){
 # decrypt profile
 gpg --quiet --batch --yes --decrypt --passphrase="$GPG_KEY" --output profile.properties scripts/profile_gcp.properties.gpg
 
-exit_code_decorator "mvn clean compile"
-exit_code_decorator "mvn -Dgpg.skip -DtagsToExclude=UnstableTest,com.snowflake.snowpark.PerfTest,SampleDataTest test"
+exit_code_decorator "sbt clean compile"
+exit_code_decorator "sbt JavaAPITests:test"
+exit_code_decorator "sbt SprocTests:test"
+exit_code_decorator "sbt NonparallelTests:test"
+exit_code_decorator "sbt UDFTests:test"
+exit_code_decorator "sbt UDTFTests:test"
+exit_code_decorator "sbt OtherTests:test"
 
diff --git a/scripts/jenkins_regress_latest_jdbc.sh b/scripts/jenkins_regress_latest_jdbc.sh
index 089f052e..9cc05cf7 100755
--- a/scripts/jenkins_regress_latest_jdbc.sh
+++ b/scripts/jenkins_regress_latest_jdbc.sh
@@ -40,8 +40,13 @@ build_jdbc
 # skip com.snowflake.snowpark.ReplSuite because classpath are not set well for local jdbc jar
 rm -fr ./src/test/scala/com/snowflake/snowpark/ReplSuite.scala
 
-exit_code_decorator "mvn clean compile"
-exit_code_decorator "mvn -Dgpg.skip -DtagsToExclude=com.snowflake.snowpark.PerfTest test"
+exit_code_decorator "sbt clean compile"
+exit_code_decorator "sbt JavaAPITests:test"
+exit_code_decorator "sbt SprocTests:test"
+exit_code_decorator "sbt NonparallelTests:test"
+exit_code_decorator "sbt UDFTests:test"
+exit_code_decorator "sbt UDTFTests:test"
+exit_code_decorator "sbt OtherTests:test"
 
 # clean up
 rm -fr snowflake-jdbc