Merge pull request #1634 from microsoft/dev/mertakman/remove-mariner1

Remove deprecated registry and Mariner1

Author: mertakman

eng/pipeline/pr-outerloop-pipeline.yml

@@ -20,10 +20,6 @@ resources:
   containers:
     - container: ubuntu2204
       image: mcr.microsoft.com/microsoft-go/infra-images:ubuntu-22.04-amd64-default-20241026145220-02e8663
-    - container: mariner1
-      image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
-    - container: mariner1arm64
-      image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-arm64-1.0-20220314-a003148
     - container: mariner2
       image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-amd64-default-20241029143752-6049f85
     - container: mariner2arm64

eng/pipeline/pr-pipeline.yml

@@ -17,10 +17,6 @@ resources:
     # separate changes.
     - container: ubuntu2204
       image: mcr.microsoft.com/microsoft-go/infra-images:ubuntu-22.04-amd64-default-20241026145220-02e8663
-    - container: mariner1
-      image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
-    - container: mariner1arm64
-      image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-arm64-1.0-20220314-a003148
     - container: mariner2
       image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-amd64-default-20241029143752-6049f85
     - container: mariner2arm64

eng/pipeline/rolling-innerloop-pipeline.yml

@@ -40,10 +40,6 @@ extends:
     containers:
       ubuntu2204:
         image: mcr.microsoft.com/microsoft-go/infra-images:ubuntu-22.04-amd64-default-20241026145220-02e8663
-      mariner1:
-        image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
-      mariner1arm64:
-        image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-arm64-1.0-20220314-a003148
       mariner2:
         image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-amd64-default-20241029143752-6049f85
       mariner2arm64:

eng/pipeline/rolling-pipeline.yml

@@ -33,10 +33,6 @@ extends:
     containers:
       ubuntu2204:
         image: mcr.microsoft.com/microsoft-go/infra-images:ubuntu-22.04-amd64-default-20241026145220-02e8663
-      mariner1:
-        image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
-      mariner1arm64:
-        image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-arm64-1.0-20220314-a003148
       mariner2:
         image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-amd64-default-20241029143752-6049f85
       mariner2arm64:

eng/pipeline/stages/go-builder-matrix-stages.yml

@@ -91,13 +91,10 @@ stages:
           - { os: linux, arch: amd64, config: devscript }
           - { os: linux, arch: amd64, config: test }
           - { os: linux, arch: amd64, config: test, distro: ubuntu }
-          - { os: linux, arch: amd64, config: test, distro: mariner2 }
           - { os: linux, arch: amd64, config: test, distro: azurelinux3 }
           - { experiment: opensslcrypto, os: linux, arch: amd64, config: test }
           - { experiment: opensslcrypto, os: linux, arch: amd64, config: test, fips: true }
           - { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: ubuntu }
-          - { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: mariner2 }
-          - { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: mariner2, fips: true }
           - { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: azurelinux3 }
           - { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: azurelinux3, fips: true }
           - { experiment: boringcrypto, os: linux, arch: amd64, config: test }

eng/pipeline/stages/run-stage.yml

@@ -71,17 +71,13 @@ stages:
             ${{ if eq(parameters.builder.hostArch, 'amd64') }}:
               ${{ if eq(parameters.builder.distro, 'ubuntu') }}:
                 container: ubuntu2204
-              ${{ elseif eq(parameters.builder.distro, 'mariner2') }}:
-                container: mariner2
               ${{ elseif eq(parameters.builder.distro, 'azurelinux3') }}:
                 container: azurelinux3
               ${{ else }}:
-                container: mariner1
+                container: mariner2
             ${{ elseif eq(parameters.builder.hostArch, 'arm64') }}:
               ${{ if eq(parameters.builder.distro, 'mariner2') }}:
                 container: mariner2arm64
-              ${{ else }}:
-               container: mariner1arm64
 
         variables:
           - group: go-cmdscan-rules