diff --git a/.github/workflows/integration-test-smoke-suite.yaml b/.github/workflows/integration-test-smoke-suite.yaml index 9156d7b5c..aa4cdda57 100644 --- a/.github/workflows/integration-test-smoke-suite.yaml +++ b/.github/workflows/integration-test-smoke-suite.yaml @@ -29,7 +29,7 @@ jobs: with: fetch-depth: 0 - - name: setup older cluster resources + - name: setup cluster resources uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/integration-test-upgrade-suite.yaml b/.github/workflows/integration-test-upgrade-suite.yaml index 7d8382e9c..4b73c97d5 100644 --- a/.github/workflows/integration-test-upgrade-suite.yaml +++ b/.github/workflows/integration-test-upgrade-suite.yaml @@ -29,7 +29,7 @@ jobs: with: fetch-depth: 0 - - name: setup older cluster resources + - name: setup cluster resources uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/integration-tests-on-release.yaml b/.github/workflows/integration-tests-on-release.yaml index 879d1bcbe..5184b6e9e 100644 --- a/.github/workflows/integration-tests-on-release.yaml +++ b/.github/workflows/integration-tests-on-release.yaml @@ -25,8 +25,7 @@ jobs: with: fetch-depth: 0 - - name: setup older cluster resources - if: ${{ env.OLDER_K8S == 'true' }} + - name: setup cluster resources uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -67,25 +66,7 @@ jobs: with: fetch-depth: 0 - - name: check matrix k8s version - run: | - echo USE_K8S=$(echo ${{ matrix.kubernetes-versions }}) - if [ $(echo ${{ matrix.kubernetes-versions }}) == "v1.19.16" ]; then - echo "OLDER_K8S=true" >> $GITHUB_ENV - else - echo "OLDER_K8S=false" >> $GITHUB_ENV - fi - echo env.OLDER_K8S - - name: setup latest cluster resources - if: ${{ env.OLDER_K8S == 'false' }} - uses: ./.github/workflows/integration-test-config-latest-k8s - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - kubernetes-version: ${{ matrix.kubernetes-versions }} - - - name: setup older cluster resources - if: ${{ env.OLDER_K8S == 'true' }} uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -125,25 +106,7 @@ jobs: with: fetch-depth: 0 - - name: check matrix k8s version - run: | - echo USE_K8S=$(echo ${{ matrix.kubernetes-versions }}) - if [ $(echo ${{ matrix.kubernetes-versions }}) == "v1.19.16" ]; then - echo "OLDER_K8S=true" >> $GITHUB_ENV - else - echo "OLDER_K8S=false" >> $GITHUB_ENV - fi - echo env.OLDER_K8S - - name: setup latest cluster resources - if: ${{ env.OLDER_K8S == 'false' }} - uses: ./.github/workflows/integration-test-config-latest-k8s - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - kubernetes-version: ${{ matrix.kubernetes-versions }} - - - name: setup older cluster resources - if: ${{ env.OLDER_K8S == 'true' }} uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -182,25 +145,7 @@ jobs: with: fetch-depth: 0 - - name: check matrix k8s version - run: | - echo USE_K8S=$(echo ${{ matrix.kubernetes-versions }}) - if [ $(echo ${{ matrix.kubernetes-versions }}) == "v1.19.16" ]; then - echo "OLDER_K8S=true" >> $GITHUB_ENV - else - echo "OLDER_K8S=false" >> $GITHUB_ENV - fi - echo env.OLDER_K8S - - name: setup latest cluster resources - if: ${{ env.OLDER_K8S == 'false' }} - uses: ./.github/workflows/integration-test-config-latest-k8s - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - kubernetes-version: ${{ matrix.kubernetes-versions }} - - - name: setup older cluster resources - if: ${{ env.OLDER_K8S == 'true' }} uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -282,25 +227,7 @@ jobs: with: fetch-depth: 0 - - name: check matrix k8s version - run: | - echo USE_K8S=$(echo ${{ matrix.kubernetes-versions }}) - if [ $(echo ${{ matrix.kubernetes-versions }}) == "v1.19.16" ]; then - echo "OLDER_K8S=true" >> $GITHUB_ENV - else - echo "OLDER_K8S=false" >> $GITHUB_ENV - fi - echo env.OLDER_K8S - - name: setup latest cluster resources - if: ${{ env.OLDER_K8S == 'false' }} - uses: ./.github/workflows/integration-test-config-latest-k8s - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - kubernetes-version: ${{ matrix.kubernetes-versions }} - - - name: setup older cluster resources - if: ${{ env.OLDER_K8S == 'true' }} uses: ./.github/workflows/integration-test-config-latest-k8s with: github-token: ${{ secrets.GITHUB_TOKEN }}