From aea4227e52abf60f9dc02e3620fe954e59dfee0e Mon Sep 17 00:00:00 2001 From: Reed Schalo Date: Fri, 12 Jul 2024 11:37:15 -0700 Subject: [PATCH 1/2] test: fix upgrade suite --- .github/workflows/e2e-upgrade.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml index 0413fef27c91..1a165ddf23f1 100644 --- a/.github/workflows/e2e-upgrade.yaml +++ b/.github/workflows/e2e-upgrade.yaml @@ -98,6 +98,14 @@ jobs: ecr_region: ${{ vars.SNAPSHOT_REGION }} prometheus_workspace_id: ${{ vars.WORKSPACE_ID }} prometheus_region: ${{ vars.PROMETHEUS_REGION }} + - name: upgrade crds + uses: ./.github/actions/e2e/upgrade-crds + with: + account_id: ${{ vars.CI_ACCOUNT_ID }} + role: ${{ vars.CI_ROLE_NAME }} + region: ${{ inputs.region }} + cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} + git_ref: ${{ inputs.to_git_ref }} - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: ref: ${{ inputs.to_git_ref }} @@ -116,14 +124,6 @@ jobs: ecr_region: ${{ vars.SNAPSHOT_REGION }} prometheus_workspace_id: ${{ vars.WORKSPACE_ID }} prometheus_region: ${{ vars.PROMETHEUS_REGION }} - - name: upgrade crds - uses: ./.github/actions/e2e/upgrade-crds - with: - account_id: ${{ vars.CI_ACCOUNT_ID }} - role: ${{ vars.CI_ROLE_NAME }} - region: ${{ inputs.region }} - cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} - git_ref: ${{ inputs.to_git_ref }} - name: run the Upgrade test suite run: | aws eks update-kubeconfig --name ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} From b360205932cdaeaed10a6c76d51afb47bc00c10e Mon Sep 17 00:00:00 2001 From: Reed Schalo Date: Fri, 12 Jul 2024 12:03:14 -0700 Subject: [PATCH 2/2] reorder --- .github/workflows/e2e-upgrade.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml index 1a165ddf23f1..cfb850fb67ad 100644 --- a/.github/workflows/e2e-upgrade.yaml +++ b/.github/workflows/e2e-upgrade.yaml @@ -98,6 +98,9 @@ jobs: ecr_region: ${{ vars.SNAPSHOT_REGION }} prometheus_workspace_id: ${{ vars.WORKSPACE_ID }} prometheus_region: ${{ vars.PROMETHEUS_REGION }} + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + with: + ref: ${{ inputs.to_git_ref }} - name: upgrade crds uses: ./.github/actions/e2e/upgrade-crds with: @@ -106,9 +109,6 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} git_ref: ${{ inputs.to_git_ref }} - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - with: - ref: ${{ inputs.to_git_ref }} - name: upgrade eks cluster '${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }}' uses: ./.github/actions/e2e/setup-cluster with: