From d24ebd660ea84d0ca620f68290d8569c9e7e1ffa Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 13 Apr 2023 10:50:51 +0200
Subject: [PATCH] ci: fix order in e2e upgrade

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 .github/workflows/e2e-upgrade.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml
index 8ef4ad73d..6cf9320c7 100644
--- a/.github/workflows/e2e-upgrade.yml
+++ b/.github/workflows/e2e-upgrade.yml
@@ -140,6 +140,13 @@ jobs:
           azureIAMCreateCredentials: ${{ secrets.AZURE_E2E_IAM_CREDENTIALS }}
 
       - name: Run upgrade test
+        env:
+          KUBECONFIG: ${{ steps.e2e_test.outputs.kubeconfig }}
+          IMAGE: ${{ inputs.toImage && inputs.toImage || steps.find-image.outputs.output }}
+          KUBERNETES: ${{ inputs.toKubernetes }}
+          MICROSERVICES: ${{ inputs.toMicroservices }}
+          WORKERNODES: ${{ inputs.workerNodesCount }}
+          CONTROLNODES: ${{ inputs.controlNodesCount }}
         run: |
           echo "Image target: $IMAGE"
           echo "K8s target: $KUBERNETES"
@@ -153,22 +160,15 @@ jobs:
           fi
 
           bazelisk run //e2e/internal/upgrade:upgrade_test -- --want-worker "$WORKERNODES" --want-control "$CONTROLNODES" --target-image "$IMAGE" "$KUBERNETES_FLAG" "$MICROSERVICES_FLAG"
-        env:
-          KUBECONFIG: ${{ steps.e2e_test.outputs.kubeconfig }}
-          IMAGE: ${{ inputs.toImage && inputs.toImage || steps.find-image.outputs.output }}
-          KUBERNETES: ${{ inputs.toKubernetes }}
-          MICROSERVICES: ${{ inputs.toMicroservices }}
-          WORKERNODES: ${{ inputs.workerNodesCount }}
-          CONTROLNODES: ${{ inputs.controlNodesCount }}
 
       - name: Always fetch logs
         if: always()
         continue-on-error: true
+        env:
+          KUBECONFIG: ${{ steps.e2e_test.outputs.kubeconfig }}
         run: |
           kubectl logs -n kube-system -l "app.kubernetes.io/name=node-maintenance-operator" --tail=-1 > node-maintenance-operator.logs
           kubectl get nodeversions.update.edgeless.systems constellation-version -o yaml > constellation-version.yaml
-        env:
-          KUBECONFIG: ${{ steps.e2e_test.outputs.kubeconfig }}
 
       - name: Always upload logs
         if: always()