code build

aws · Apr 16, 2024 · a84e611 · a84e611
1 parent c98f86b
commit a84e611
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/run-integration-tests-codebuild.yml b/.github/workflows/run-integration-tests-codebuild.yml
@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - main
-      - workflow
+      - workflow-mysql
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         engine_version: ["lts"]
-        environment: ["pg_integ"]
+        environment: ["mysql_integ"]
     runs-on: codebuild-jdbcWrapper-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ matrix.environment }}
     steps:
@@ -50,15 +50,15 @@ jobs:
           echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
       - name: Run integration tests
         run: |
-          ./gradlew --no-parallel --no-daemon test-all-aurora
+          ./gradlew --no-parallel --no-daemon test-all-mysql-aurora
         env:
           AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
           AURORA_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
           AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
           AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
           RDS_ENDPOINT: ${{ secrets.RDS_ENDPOINT }}
-          AURORA_MYSQL_DB_ENGINE_VERSION: ${{ matrix.engine_version }}
+          AURORA_MYSQL_DB_ENGINE_VERSION: ${{ secrets.engine_version }}
           AURORA_PG_ENGINE_VERSION: ${{ matrix.engine_version }}
       - name: 'Archive junit results ${{ matrix.engine_version }}'
         if: always()

diff --git a/wrapper/build.gradle.kts b/wrapper/build.gradle.kts
@@ -347,6 +347,8 @@ tasks.register<Test>("test-all-pg-aurora") {
         systemProperty("test-no-mysql-engine", "true")
         systemProperty("test-no-mariadb-driver", "true")
         systemProperty("test-no-mariadb-engine", "true")
+        systemProperty("test-no-graalvm", "true")
+        systemProperty("test-no-openjdk11", "true")
     }
 }
 

diff --git a/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java b/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java
@@ -351,12 +351,12 @@ public void test_setReadOnly_closedConnection() throws SQLException {
   }
 
   /**
-   * PG driver has check of internal readOnly flag and doesn't communicate to a DB server
-   * if there's no changes. Thus, network exception is not raised.
+   * PG driver and MariaDB driver have a check for internal readOnly flag and don't communicate to a DB server
+   * if there are no changes. Thus, network exception is not raised.
    */
   @TestTemplate
   @EnableOnTestFeature(TestEnvironmentFeatures.NETWORK_OUTAGES_ENABLED)
-  @DisableOnTestDriver(TestDriver.PG) // see comments above
+  @DisableOnTestDriver({TestDriver.PG, TestDriver.MARIADB}) // see comments above
   public void test_setReadOnlyFalse_allInstancesDown() throws SQLException {
     try (final Connection conn = DriverManager.getConnection(
         ConnectionStringHelper.getProxyWrapperUrl(), getProxiedProps())) {