test: remove specific tests for mux/regular sessions

Remove separate tests for using multiplexed or regular sessions, and instead only
test for using the default.

Author: olavloite

.github/sync-repo-settings.yaml

@@ -14,13 +14,10 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
       - compile (11)
-      - units-with-multiplexed-session (8)
-      - units-with-multiplexed-session (11)
       - unmanaged_dependency_check
       - library_generation
   - pattern: 3.3.x
@@ -154,13 +151,10 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
       - compile (11)
-      - units-with-multiplexed-session (8)
-      - units-with-multiplexed-session (11)
   - pattern: 6.88.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
@@ -173,13 +167,10 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
       - compile (11)
-      - units-with-multiplexed-session (8)
-      - units-with-multiplexed-session (11)
       - unmanaged_dependency_check
       - library_generation
   - pattern: 6.96.x
@@ -194,13 +185,10 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
       - compile (11)
-      - units-with-multiplexed-session (8)
-      - units-with-multiplexed-session (11)
       - unmanaged_dependency_check
       - library_generation
   - pattern: 6.95.x
@@ -215,13 +203,10 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
       - compile (11)
-      - units-with-multiplexed-session (8)
-      - units-with-multiplexed-session (11)
       - unmanaged_dependency_check
       - library_generation
 permissionRules:

.github/workflows/ci.yaml

@@ -36,41 +36,6 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
-  units-with-multiplexed-session:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java: [ 11, 17, 21 ]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
-      with:
-        distribution: temurin
-        java-version: ${{matrix.java}}
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: test
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
-  units-with-regular-session:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java: [ 11, 17, 21 ]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
-      with:
-        distribution: temurin
-        java-version: ${{matrix.java}}
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: test
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
   units-java8:
     # Building using Java 17 and run the tests with Java 8 runtime
     name: "units (8)"
@@ -90,48 +55,6 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
-  units-with-multiplexed-session8:
-    # Building using Java 17 and run the tests with Java 8 runtime
-    name: "units-with-multiplexed-session (8)"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
-        with:
-          java-version: 8
-          distribution: temurin
-      - run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
-        shell: bash
-      - uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: temurin
-      - run: .kokoro/build.sh
-        env:
-          JOB_TYPE: test
-          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
-          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
-          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
-  units-with-regular-session8:
-    # Building using Java 17 and run the tests with Java 8 runtime
-    name: "units-with-regular-session (8)"
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
-      with:
-        java-version: 8
-        distribution: temurin
-    - run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
-      shell: bash
-    - uses: actions/setup-java@v3
-      with:
-        java-version: 17
-        distribution: temurin
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: test
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
   windows:
     runs-on: windows-latest
     steps:

.github/workflows/integration-tests-against-emulator-with-regular-session.yaml

@@ -119,21 +119,6 @@ integration-directpath-enabled)
       verify
     RETURN_CODE=$?
     ;;
-integration-multiplexed-sessions-enabled)
-    mvn -B ${INTEGRATION_TEST_ARGS} \
-      -ntp \
-      -Penable-integration-tests \
-      -Djava.net.preferIPv4Stack=true \
-      -DtrimStackTrace=false \
-      -Dclirr.skip=true \
-      -Denforcer.skip=true \
-      -Dmaven.main.skip=true \
-      -Dspanner.gce.config.project_id=gcloud-devel \
-      -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-multiplexed-sessions \
-      -fae \
-      verify
-    RETURN_CODE=$?
-    ;;
 integration-cloud-devel)
     mvn -B ${INTEGRATION_TEST_ARGS} \
       -ntp \