From 99817ba6a6912f5d3ba0db4d4a52d5c2988e62a6 Mon Sep 17 00:00:00 2001
From: qmuntal <qmuntaldiaz@microsoft.com>
Date: Fri, 25 Oct 2024 08:53:47 +0200
Subject: [PATCH] add mariner2 to CI matrix

---
 eng/pipeline/pr-outerloop-pipeline.yml           | 4 ++++
 eng/pipeline/rolling-innerloop-pipeline.yml      | 4 ++++
 eng/pipeline/rolling-pipeline.yml                | 4 ++++
 eng/pipeline/stages/go-builder-matrix-stages.yml | 3 +++
 eng/pipeline/stages/run-stage.yml                | 7 ++++++-
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/eng/pipeline/pr-outerloop-pipeline.yml b/eng/pipeline/pr-outerloop-pipeline.yml
index 45fc874377..5ac769ef97 100644
--- a/eng/pipeline/pr-outerloop-pipeline.yml
+++ b/eng/pipeline/pr-outerloop-pipeline.yml
@@ -24,6 +24,10 @@ resources:
       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-20241024174534-e697cea
+    - container: mariner2arm64
+      image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default-20241024174534-e697cea
     - container: azurelinux3
       image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default-20241024144202-a3a1203
 
diff --git a/eng/pipeline/rolling-innerloop-pipeline.yml b/eng/pipeline/rolling-innerloop-pipeline.yml
index 85ba25c14b..c376272db1 100644
--- a/eng/pipeline/rolling-innerloop-pipeline.yml
+++ b/eng/pipeline/rolling-innerloop-pipeline.yml
@@ -44,6 +44,10 @@ extends:
         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-20241024174534-e697cea
+      mariner2arm64:
+        image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default-20241024174534-e697cea
       azurelinux3:
         image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default-20241024144202-a3a1203
 
diff --git a/eng/pipeline/rolling-pipeline.yml b/eng/pipeline/rolling-pipeline.yml
index e360909614..8e3cb999c4 100644
--- a/eng/pipeline/rolling-pipeline.yml
+++ b/eng/pipeline/rolling-pipeline.yml
@@ -37,6 +37,10 @@ extends:
         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-20241024174534-e697cea
+      mariner2arm64:
+        image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default-20241024174534-e697cea
       azurelinux3:
         image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default-20241024144202-a3a1203
 
diff --git a/eng/pipeline/stages/go-builder-matrix-stages.yml b/eng/pipeline/stages/go-builder-matrix-stages.yml
index 60e3b51638..59f45aa098 100644
--- a/eng/pipeline/stages/go-builder-matrix-stages.yml
+++ b/eng/pipeline/stages/go-builder-matrix-stages.yml
@@ -73,14 +73,17 @@ stages:
           - { os: linux, arch: arm64, hostArch: amd64, config: buildandpack }
           - ${{ if parameters.includeArm64Host }}:
             - { os: linux, arch: arm64, config: buildandpack }
+            - { os: linux, arch: arm64, config: buildandpack, distro: mariner2 }
         - ${{ if parameters.innerloop }}:
           - { 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, broken: true }
           - { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: azurelinux3, broken: true }
           - { experiment: boringcrypto, os: linux, arch: amd64, config: test }
           - { experiment: boringcrypto, os: linux, arch: amd64, config: test, distro: ubuntu }
diff --git a/eng/pipeline/stages/run-stage.yml b/eng/pipeline/stages/run-stage.yml
index 011e94ce99..30f80252a8 100644
--- a/eng/pipeline/stages/run-stage.yml
+++ b/eng/pipeline/stages/run-stage.yml
@@ -71,12 +71,17 @@ 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
             ${{ elseif eq(parameters.builder.hostArch, 'arm64') }}:
-              container: mariner1arm64
+              ${{ if eq(parameters.builder.distro, 'mariner2') }}:
+                container: mariner2arm64
+              ${{ else }}:
+                container: mariner1arm64
 
         variables:
           - group: go-cmdscan-rules