Get service connection name from pipeline variable (#7242)

Cherry-pick 4605c1a
Azure · Mar 16, 2024 · 42295cc · 42295cc
1 parent 71f4974
commit 42295cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/builds/e2e/e2e.yaml b/builds/e2e/e2e.yaml
@@ -139,9 +139,7 @@ jobs:
     timeoutInMinutes: 120
 
     steps:
-    - template: templates/e2e-clean-directory.yaml
     - template: templates/e2e-setup.yaml
-    - template: templates/e2e-clear-docker-cached-images.yaml
     - template: templates/e2e-run.yaml
 
 ################################################################################
@@ -164,9 +162,7 @@ jobs:
     timeoutInMinutes: 90
 
     steps:
-    - template: templates/e2e-clean-directory.yaml
     - template: templates/e2e-setup.yaml
-    - template: templates/e2e-clear-docker-cached-images.yaml
     - template: templates/e2e-run.yaml
 
 ################################################################################
@@ -189,9 +185,7 @@ jobs:
     timeoutInMinutes: 90
 
     steps:
-    - template: templates/e2e-clean-directory.yaml
     - template: templates/e2e-setup.yaml
-    - template: templates/e2e-clear-docker-cached-images.yaml
     - template: templates/e2e-run.yaml
 
 ################################################################################
@@ -249,9 +243,7 @@ jobs:
       identityServicePackageFilter: aziot-identity-service-*.x86_64.rpm
 
     steps:
-    - template: templates/e2e-clean-directory.yaml
     - template: templates/e2e-setup.yaml
-    - template: templates/e2e-clear-docker-cached-images.yaml
     - template: templates/e2e-run.yaml
 
   ################################################################################

diff --git a/builds/e2e/templates/e2e-clear-docker-cached-images.yaml b/builds/e2e/templates/e2e-clear-docker-cached-images.yaml
@@ -1,9 +1,9 @@
 steps:
 - task: Docker@2
-  displayName: Docker login edgebuilds
+  displayName: Docker login
   inputs:
     command: login
-    containerRegistry: iotedge-edgebuilds-acr
+    containerRegistry: $(service-connection.registry)
 
 - pwsh: |
     # We use a self-hosted agent for this job, so we need to clean up