Remove usages of 1es-official.yml and 1es-unofficial.yml pipeline templates

eng/docker-tools/templates/jobs/publish.yml

@@ -254,12 +254,10 @@ jobs:
     condition: and(succeeded(), eq(variables['publishImageInfo'], 'true'))
     displayName: Publish Image Info
 
-  # Task displayNames names are hardcoded to reference the task prefix used by 1ES official
-  # pipelines in eng/docker-tools/templates/1es-official.yml.
-  #
-  # These will fail if they are dependend on by an unofficial pipeline since they use a unique task
-  # prefix compared to official pipelines (see eng/docker-tools/templates/1es-unofficial.yml). This is
-  # acceptable because unofficial pipelines should not publish images.
+  # Task displayNames are hardcoded to reference the task prefix used by 1ES official
+  # pipelines (🟪). These will fail if they are depended on by an unofficial pipeline since
+  # they use a unique task prefix compared to official pipelines (🟦).
+  # This is acceptable because unofficial pipelines should not publish images.
   #
   # https://github.com/dotnet/docker-tools/issues/1698 tracks making this command no longer depend
   # on individual step displayNames.

eng/pipelines/annotate-eol-digests.yml

@@ -14,12 +14,14 @@ variables:
   value: ""
 
 extends:
-  template: /eng/docker-tools/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
-    serviceConnections:
-    - name: $(publish.serviceConnectionName)
-    - name: $(marStatus.serviceConnectionName)
     stages:
+    - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
+      parameters:
+        serviceConnections:
+        - name: $(publish.serviceConnectionName)
+        - name: $(marStatus.serviceConnectionName)
     - stage: eolAnnotate
       displayName: Annotate EOL images
       dependsOn: []

eng/pipelines/cg-detection.yml

@@ -20,9 +20,8 @@ variables:
   value: false
 
 extends:
-  template: /eng/docker-tools/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
-    cgDryRun: ${{ parameters.cgDryRun }}
     stages:
     - stage: CgDetection
       displayName: CG Detection

eng/pipelines/check-base-image-updates.yml

@@ -15,11 +15,13 @@ variables:
 - template: /eng/docker-tools/templates/variables/dotnet/secrets.yml@self
 
 extends:
-  template: /eng/docker-tools/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
-    serviceConnections:
-    - name: $(acr-staging.serviceConnectionName)
     stages:
+    - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
+      parameters:
+        serviceConnections:
+        - name: $(acr-staging.serviceConnectionName)
     - stage: CheckBaseImages
       displayName: Check Base Images
       dependsOn: []

eng/pipelines/cleanup-acr-images-custom-official.yml

@@ -27,11 +27,13 @@ parameters:
   type: int
 
 extends:
-  template: /eng/docker-tools/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
-    serviceConnections:
-    - name: $(clean.serviceConnectionName)
     stages:
+    - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
+      parameters:
+        serviceConnections:
+        - name: $(clean.serviceConnectionName)
     - template: /eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml@self
       parameters:
         stagesTemplate: /eng/pipelines/templates/stages/cleanup-acr-images-custom.yml@self

eng/pipelines/cleanup-acr-images-official.yml

@@ -22,15 +22,17 @@ variables:
   readonly: true
 
 extends:
-  template: /eng/docker-tools/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
-    serviceConnections:
-    # For image removal
-    - name: $(clean.serviceConnectionName)
-    # For EOL annotations
-    - name: $(build.serviceConnectionName)
-    - name: $(public-mirror.serviceConnectionName)
     stages:
+    - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
+      parameters:
+        serviceConnections:
+        # For image removal
+        - name: $(clean.serviceConnectionName)
+        # For EOL annotations
+        - name: $(build.serviceConnectionName)
+        - name: $(public-mirror.serviceConnectionName)
     - template: /eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml@self
       parameters:
         stagesTemplate: /eng/pipelines/templates/stages/cleanup-acr-images.yml@self

eng/pipelines/cleanup-acr-images-unofficial.yml

@@ -14,15 +14,17 @@ variables:
   readonly: true
 
 extends:
-  template: /eng/docker-tools/templates/1es-unofficial.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
-    serviceConnections:
-    # For image removal
-    - name: $(clean-test.serviceConnectionName)
-    # For EOL annotations
-    - name: $(build-test.serviceConnectionName)
-    - name: $(public-mirror.serviceConnectionName)
     stages:
+    - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
+      parameters:
+        serviceConnections:
+        # For image removal
+        - name: $(clean-test.serviceConnectionName)
+        # For EOL annotations
+        - name: $(build-test.serviceConnectionName)
+        - name: $(public-mirror.serviceConnectionName)
     - template: /eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml@self
       parameters:
         stagesTemplate: /eng/pipelines/templates/stages/cleanup-acr-images.yml@self

eng/pipelines/import-image.yml

@@ -34,7 +34,7 @@ variables:
     value: ''
 
 extends:
-  template: /eng/docker-tools/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
     stages:
     - stage: Import

eng/pipelines/mirror-base-images.yml

@@ -23,11 +23,13 @@ variables:
   value: ""
 
 extends:
-  template: /eng/docker-tools/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
-    serviceConnections:
-    - name: $(public-mirror.serviceConnectionName)
     stages:
+    - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
+      parameters:
+        serviceConnections:
+        - name: $(public-mirror.serviceConnectionName)
     - stage: MirrorBaseImages
       displayName: Mirror Base Images
       dependsOn: []

eng/pipelines/secret-management-weekly.yml

@@ -12,7 +12,7 @@ variables:
 - template: templates/variables/common.yml
 
 extends:
-  template: /eng/docker-tools/templates/1es-unofficial.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
     stages:
     - stage: SynchronizeSecrets

eng/pipelines/upload-file.yml

@@ -16,7 +16,7 @@ variables:
 - template: /eng/pipelines/templates/variables/common.yml@self
 
 extends:
-  template: /eng/docker-tools/templates/1es-official.yml@self
+  template: /eng/docker-tools/templates/1es.yml@self
   parameters:
     stages:
     - stage: UploadFile