Merge pull request #4859 from werf/ci-too-many-params-in-matrix-make-…

…job-name-unreadable-3 ci: too many params in matrix make job name unreadable /3
werf · Aug 26, 2022 · cb2497b · cb2497b
2 parents 2498fe5 + 1687668
commit cb2497b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/_test_integration_per-k8s-version-and-container-registry.yml b/.github/workflows/_test_integration_per-k8s-version-and-container-registry.yml
@@ -25,8 +25,10 @@ jobs:
         os:
           - ${{ inputs.linuxAmd64Runner }}
         k8s-version:
-          - 1.23
-          - 1.25
+          - major: 1
+            minor: 23
+          - major: 1
+            minor: 25
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     env:
@@ -118,7 +120,6 @@ jobs:
 
       - name: Test
         run: |
-          eval export WERF_TEST_K8S_BASE64_KUBECONFIG="\$WERF_TEST_K8S_BASE64_KUBECONFIG_$(tr . _ <<< ${{ matrix.k8s-version }})"
           source ./scripts/ci/integration_k8s_tests_before_hook.sh
           if ${{ inputs.coverage }}; then
             task -p test:integration paths="integration/suites/cleanup_after_converge integration/suites/deploy integration/suites/helm/deploy_rollback" -- --flake-attempts=3 --coverprofile="$(openssl rand -hex 6)-coverage.out" --keep-going
@@ -128,6 +129,7 @@ jobs:
           fi
           echo loadavg: $(cat /proc/loadavg)
         env:
+          WERF_TEST_K8S_BASE64_KUBECONFIG: ${{ secrets[format('WERF_TEST_K8S_BASE64_KUBECONFIG_{0}_{1}', matrix.k8s-version.major, matrix.k8s-version.minor)] }}
           WERF_TEST_K8S_DOCKER_REGISTRY: ${{ secrets.WERF_TEST_K8S_DOCKER_REGISTRY }}
           WERF_TEST_K8S_DOCKER_REGISTRY_USERNAME: ${{ secrets.WERF_TEST_K8S_DOCKER_REGISTRY_USERNAME }}
           WERF_TEST_K8S_DOCKER_REGISTRY_PASSWORD: ${{ secrets.WERF_TEST_K8S_DOCKER_REGISTRY_PASSWORD }}

diff --git a/.github/workflows/_test_integration_per-k8s-version.yml b/.github/workflows/_test_integration_per-k8s-version.yml
@@ -25,8 +25,10 @@ jobs:
         os:
           - ${{ inputs.linuxAmd64Runner }}
         k8s-version:
-          - 1.23
-          - 1.25
+          - major: 1
+            minor: 23
+          - major: 1
+            minor: 25
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -59,7 +61,6 @@ jobs:
 
       - name: Test
         run: |
-          eval export WERF_TEST_K8S_BASE64_KUBECONFIG="\$WERF_TEST_K8S_BASE64_KUBECONFIG_$(tr . _ <<< ${{ matrix.k8s-version }})"
           source ./scripts/ci/integration_k8s_tests_before_hook.sh
           if ${{ inputs.coverage }}; then
             task -p test:integration paths="integration/suites/cleanup_after_converge integration/suites/deploy integration/suites/helm/deploy_rollback" -- --coverprofile="$(openssl rand -hex 6)-coverage.out" --keep-going
@@ -69,6 +70,7 @@ jobs:
           fi
           echo loadavg: $(cat /proc/loadavg)
         env:
+          WERF_TEST_K8S_BASE64_KUBECONFIG: ${{ secrets[format('WERF_TEST_K8S_BASE64_KUBECONFIG_{0}_{1}', matrix.k8s-version.major, matrix.k8s-version.minor)] }}
           WERF_TEST_K8S_DOCKER_REGISTRY: ${{ secrets.WERF_TEST_K8S_DOCKER_REGISTRY }}
           WERF_TEST_K8S_DOCKER_REGISTRY_USERNAME: ${{ secrets.WERF_TEST_K8S_DOCKER_REGISTRY_USERNAME }}
           WERF_TEST_K8S_DOCKER_REGISTRY_PASSWORD: ${{ secrets.WERF_TEST_K8S_DOCKER_REGISTRY_PASSWORD }}