SNOW-1333078: Add maven opts to the test script

snowflakedb · Apr 17, 2024 · 43c78b7 · 43c78b7
1 parent eaf6463
commit 43c78b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -57,7 +57,6 @@ jobs:
                 TARGET_DOCKER_TEST_IMAGE: ${{ matrix.image }}
                 JDBC_TEST_CATEGORY: ${{ matrix.category }}
                 ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
-                MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
               run: ./ci/test.sh
 
     test-linux-old-driver:
@@ -79,6 +78,5 @@ jobs:
                 CLOUD_PROVIDER: ${{ matrix.cloud }}
                 TARGET_DOCKER_TEST_IMAGE: ${{ matrix.image }}
                 JDBC_TEST_CATEGORY: ${{ matrix.category }}
-                MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
                 is_old_driver: ${{ matrix.is_old_driver }}
               run: ./ci/test.sh
diff --git a/ci/container/test_component.sh b/ci/container/test_component.sh
@@ -20,7 +20,6 @@ fi
 eval $(jq -r '.testconnection | to_entries | map("export \(.key)=\(.value|tostring)")|.[]' $PARAMETER_FILE)
 eval $(jq -r '.orgconnection | to_entries | map("export \(.key)=\(.value|tostring)")|.[]' $PARAMETER_FILE)
 
-
 if [[ -n "$GITHUB_SHA" ]]; then
     # Github Action
     export TARGET_SCHEMA_NAME=${RUNNER_TRACKING_ID//-/_}_${GITHUB_SHA}
@@ -71,6 +70,9 @@ python3 $THIS_DIR/hang_webserver.py 12345&
 IFS=','
 read -ra CATEGORY <<< "$JDBC_TEST_CATEGORY" 
 
+# Avoid connection timeout
+export MAVEN_OPTS="$MAVEN_OPTS -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120"
+
 cd $SOURCE_ROOT
 for c in "${CATEGORY[@]}"; do
     c=$(echo $c | sed 's/ *$//g')