SNOW-1016467: Support test Mac environment in Github actions. (snowflakedb#1765)

* SNOW-1016467 Support test Mac environment in Github actions.

* Changed task name to include OS and java version

Author: sfc-gh-jmartinezramirez

.github/workflows/build-test.yml

@@ -36,6 +36,39 @@ jobs:
                 WHITESOURCE_API_KEY: ${{ secrets.WHITESOURCE_API_KEY }}
               run: ./ci/build.sh
 
+    test-mac:
+        needs: build
+        name: ${{ matrix.cloud }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }} / Test on Mac(java ${{ matrix.javaVersion }}, ${{ matrix.cloud }} )
+        runs-on: macos-13
+        strategy:
+            fail-fast: false
+            matrix:
+                cloud: [ 'AWS' ]
+                javaVersion: [ '8', '11', '17']
+                category: ['TestCategoryResultSet,TestCategoryOthers,TestCategoryLoader', 'TestCategoryConnection,TestCategoryStatement', 'TestCategoryArrow,TestCategoryCore', 'TestCategoryFips']
+                additionalMavenProfile: ['', '-Dthin-jar']
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-java@v4
+              with:
+                java-version: ${{ matrix.javaVersion }}
+                distribution: 'temurin'
+                cache: maven
+            - uses: actions/setup-python@v4
+              with:
+                python-version: '3.7'
+            - name: Install Homebrew Bash
+              shell: bash
+              run: brew install bash
+            - name: Tests
+              shell: bash
+              env:
+                PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
+                CLOUD_PROVIDER: ${{ matrix.cloud }}
+                JDBC_TEST_CATEGORY: ${{ matrix.category }}
+                ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
+              run: /usr/local/bin/bash ./ci/test_mac.sh
+
     test-linux:
         needs: build
         name: ${{ matrix.cloud }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }} on ${{ matrix.image }}

ci/container/test_component.sh

@@ -1,11 +1,12 @@
 #!/bin/bash -e
 #
-# Test JDBC for Linux
+# Test JDBC for Linux/MAC
 #
 set -o pipefail
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export WORKSPACE=${WORKSPACE:-/mnt/workspace}
 export SOURCE_ROOT=${SOURCE_ROOT:-/mnt/host}
+MVNW_EXE=$SOURCE_ROOT/mvnw
 
 echo "[INFO] Download JDBC Integration test cases and libraries"
 source $THIS_DIR/download_artifact.sh
@@ -76,15 +77,15 @@ export MAVEN_OPTS="$MAVEN_OPTS -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=fa
 cd $SOURCE_ROOT
 
 # Avoid connection timeout on plugin dependency fetch or fail-fast when dependency cannot be fetched
-mvn --batch-mode --show-version dependency:go-offline
+$MVNW_EXE --batch-mode --show-version dependency:go-offline
 
 for c in "${CATEGORY[@]}"; do
     c=$(echo $c | sed 's/ *$//g')
     if [[ "$is_old_driver" == "true" ]]; then
         pushd TestOnly >& /dev/null
-            JDBC_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version --batch-mode | grep -v "[INFO]")
+            JDBC_VERSION=$($MVNW_EXE org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version --batch-mode | grep -v "[INFO]")
             echo "[INFO] Run JDBC $JDBC_VERSION tests"
-            mvn -DjenkinsIT \
+            $MVNW_EXE -DjenkinsIT \
                 -Djava.io.tmpdir=$WORKSPACE \
                 -Djacoco.skip.instrument=false \
                 -DtestCategory=net.snowflake.client.category.$c \
@@ -95,7 +96,7 @@ for c in "${CATEGORY[@]}"; do
     elif [[ "$c" == "TestCategoryFips" ]]; then
         pushd FIPS >& /dev/null
             echo "[INFO] Run Fips tests"
-            mvn -DjenkinsIT \
+            $MVNW_EXE -DjenkinsIT \
                 -Djava.io.tmpdir=$WORKSPACE \
                 -Djacoco.skip.instrument=false \
                 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
@@ -105,7 +106,7 @@ for c in "${CATEGORY[@]}"; do
         popd >& /dev/null
     else
         echo "[INFO] Run $c tests"
-        mvn -DjenkinsIT \
+        $MVNW_EXE -DjenkinsIT \
             -Djava.io.tmpdir=$WORKSPACE \
             -Djacoco.skip.instrument=false \
             -DtestCategory=net.snowflake.client.category.$c \

ci/log_analyze_setup.sh

@@ -31,19 +31,36 @@ fi
 # The new complex password we use for jenkins test
 export SNOWFLAKE_TEST_PASSWORD_NEW="ThisIsRandomPassword123!"
 
-LOG_PROPERTY_FILE_DOCKER=$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; pwd)/src/test/resources/logging.properties
+LOG_PROPERTY_FILE=$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; pwd)/src/test/resources/logging.properties
 
 export CLIENT_DRIVER_NAME=JDBC
 
 function setup_log_env() {
-    sed -i "s|^java.util.logging.FileHandler.pattern.*|java.util.logging.FileHandler.pattern = $CLIENT_LOG_FILE_PATH_DOCKER|" ${LOG_PROPERTY_FILE_DOCKER}
+    if ["$WORKSPACE" == "/mnt/workspace"]; then
+        CLIENT_LOG_DIR_PATH=$LOCAL_CLIENT_LOG_DIR_PATH_DOCKER
+        CLIENT_LOG_FILE_PATH=$CLIENT_LOG_FILE_PATH_DOCKER
+        CLIENT_KNOWN_SSM_FILE_PATH=$CLIENT_KNOWN_SSM_FILE_PATH_DOCKER
+    else
+        CLIENT_LOG_DIR_PATH=$LOCAL_CLIENT_LOG_DIR_PATH
+        CLIENT_LOG_FILE_PATH=$CLIENT_LOG_FILE_PATH
+        CLIENT_KNOWN_SSM_FILE_PATH=$CLIENT_KNOWN_SSM_FILE_PATH
+    fi
+    echo "[INFO] CLIENT_LOG_DIR_PATH=$CLIENT_LOG_DIR_PATH"  
+    echo "[INFO] CLIENT_LOG_FILE_PATH=$CLIENT_LOG_FILE_PATH"
+    echo "[INFO] CLIENT_KNOWN_SSM_FILE_PATH=$CLIENT_KNOWN_SSM_FILE_PATH"
+    echo "[INFO] Replace file handler for log file $LOG_PROPERTY_FILE"
+
+    sed  -i'' -e "s|^java.util.logging.FileHandler.pattern.*|java.util.logging.FileHandler.pattern = $CLIENT_LOG_FILE_PATH|" ${LOG_PROPERTY_FILE}
 
-    if [[ ! -d ${LOCAL_CLIENT_LOG_DIR_PATH_DOCKER} ]]; then
-      mkdir -p ${LOCAL_CLIENT_LOG_DIR_PATH_DOCKER}
+    if [[ ! -d ${CLIENT_LOG_DIR_PATH} ]]; then
+      echo "[INFO] create clien log directory $CLIENT_LOG_DIR_PATH"
+      mkdir -p ${CLIENT_LOG_DIR_PATH}
     fi
 
-    if [[ -f $CLIENT_KNOWN_SSM_FILE_PATH_DOCKER ]]; then
-        rm -f $CLIENT_KNOWN_SSM_FILE_PATH_DOCKER
+    if [[ -f $CLIENT_KNOWN_SSM_FILE_PATH ]]; then
+        rm -f $CLIENT_KNOWN_SSM_FILE_PATH
     fi
-    touch $CLIENT_KNOWN_SSM_FILE_PATH_DOCKER
+
+    touch $CLIENT_KNOWN_SSM_FILE_PATH
+    echo "[INFO] finish setup log env"
 }

ci/test_mac.sh

@@ -0,0 +1,21 @@
+#!/bin/bash -e
+#
+# Test JDBC for Mac
+#
+
+echo "DOWNLOADED"
+set -o pipefail
+THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source $THIS_DIR/_init.sh
+source $THIS_DIR/scripts/set_git_info.sh
+
+
+export WORKSPACE=$GITHUB_WORKSPACE
+export SOURCE_ROOT=$GITHUB_WORKSPACE
+
+python3 --version
+python3 -m venv venv
+source venv/bin/activate
+pip3 install -U pip
+pip3 install -U snowflake-connector-python
+$THIS_DIR/container/test_component.sh