chore: (A-494) split networks into separate jobs to have independent cleanup (#20087)

splitting network tests into separate jobs for independent cleanup

Author: PhilWindle

.github/workflows/ci3.yml

@@ -125,6 +125,10 @@ jobs:
   # Runs two test sets in parallel.
   ci-network-scenario:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        test_set: ["1", "2"]
     # We either run after a release (tag starting with v), or when the ci-network-scenario label is present in a PR.
     # We exclude ci-release-pr test tags (v0.0.1-commit.*) which are only for testing the release process.
     needs: ci
@@ -166,7 +170,7 @@ jobs:
             docker_image=""
           fi
           set -x # print next line
-          ./.github/ci3.sh network-scenarios next-scenario "$namespace" "$docker_image"
+          ./.github/ci3.sh network-scenarios next-scenario "$namespace" "$docker_image" "${{ matrix.test_set }}"
 
       - name: Cleanup network resources
         # Clean up if this is a CI label or nightly.
@@ -180,8 +184,7 @@ jobs:
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
           NO_SPOT: 1
         run: |
-          ./.github/ci3.sh network-teardown next-scenario "${NAMESPACE}-1" || true
-          ./.github/ci3.sh network-teardown next-scenario "${NAMESPACE}-2" || true
+          ./.github/ci3.sh network-teardown next-scenario "${NAMESPACE}-${{ matrix.test_set }}" || true
 
       #############
       # Benchmarks

.github/workflows/test-network-scenarios.yml

@@ -32,6 +32,10 @@ concurrency:
 jobs:
   deploy-and-test:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        test_set: ${{ fromJSON(inputs.test_set == '' && '["1","2"]' || format('["{0}"]', inputs.test_set)) }}
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -51,8 +55,8 @@ jobs:
         run: |
           namespace=$(echo "${{ inputs.namespace }}" | sed 's/[^a-z0-9-]/-/g' | cut -c1-20)
           echo "NAMESPACE=$namespace" >> $GITHUB_ENV
-          # Run scenario tests (both sets in parallel, or specific set if provided)
-          ./.github/ci3.sh network-scenarios "${{ inputs.env_file }}" "$namespace" "${{ inputs.docker_image }}" "${{ inputs.test_set }}"
+          # Run scenario tests for the selected set (matrix expands to 1 or 2).
+          ./.github/ci3.sh network-scenarios "${{ inputs.env_file }}" "$namespace" "${{ inputs.docker_image }}" "${{ matrix.test_set }}"
 
       - name: Cleanup network resources
         if: always()
@@ -65,10 +69,4 @@ jobs:
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
           NO_SPOT: 1
         run: |
-          test_set="${{ inputs.test_set }}"
-          if [[ -z "$test_set" ]]; then
-            ./.github/ci3.sh network-teardown "${{ inputs.env_file }}" "${NAMESPACE}-1" || true
-            ./.github/ci3.sh network-teardown "${{ inputs.env_file }}" "${NAMESPACE}-2" || true
-          else
-            ./.github/ci3.sh network-teardown "${{ inputs.env_file }}" "${NAMESPACE}-${test_set}" || true
-          fi
+          ./.github/ci3.sh network-teardown "${{ inputs.env_file }}" "${NAMESPACE}-${{ matrix.test_set }}" || true