try fix

Azure · Apr 5, 2024 · 8e74419 · 8e74419
1 parent 1c1940f
commit 8e74419
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.pipelines/e2e.yml b/.pipelines/e2e.yml
@@ -37,12 +37,6 @@ jobs:
       - template: ./templates/template-az-cli-login.yml
         parameters:
           azureDevOpsJSONSPN: $(aro-v4-e2e-devops-spn)
-      - template: ./templates/template-push-images-to-acr.yml
-        parameters:
-          rpImageACR: $(RP_IMAGE_ACR)
-      - script: |
-          make extract-aro-docker
-        displayName: Extract ARO binaries from build
 
       - script: |
           az account set -s $AZURE_SUBSCRIPTION_ID
@@ -55,6 +49,13 @@ jobs:
           deploy_e2e_db
         displayName: Setup (Azure)
 
+      - template: ./templates/template-push-images-to-acr.yml
+        parameters:
+          rpImageACR: $(RP_IMAGE_ACR)
+      - script: |
+          make extract-aro-docker
+        displayName: Extract ARO binaries from build
+
       - script: |
           export CI=true
           . secrets/env

diff --git a/hack/e2e/run-rp-and-e2e.sh b/hack/e2e/run-rp-and-e2e.sh
@@ -228,13 +228,13 @@ get_cluster_sp() {
         --name=aro-v4-e2e-devops-spn-1-secret-value \
         --file=secrets/secret-value
 
-    echo "\\nexport AZURE_CLUSTER_SERVICE_PRINCIPAL_ID=\'" >>secrets/env
+    echo -e -n "\nexport AZURE_CLUSTER_SERVICE_PRINCIPAL_ID=\'" >>secrets/env
     cat secrets/sp-id >>secrets/env
-    echo "\'\\nexport AZURE_CLUSTER_APP_ID=\'" >>secrets/env
+    echo -e -n "\'\nexport AZURE_CLUSTER_APP_ID=\'" >>secrets/env
     cat secrets/app-id >>secrets/env
-    echo "\'\\nexport AZURE_CLUSTER_APP_SECRET=\'" >>secrets/env
+    echo -e -n "\'\nexport AZURE_CLUSTER_APP_SECRET=\'" >>secrets/env
     cat secrets/secret-value >>secrets/env
-    echo "\'\\n" >>secrets/env
+    echo -e -n "\'\n" >>secrets/env
 }
 
 # TODO: CLUSTER and is also recalculated in multiple places