From aad30a266df043874a632d49d254b159aca3635e Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Wed, 13 Mar 2024 08:40:38 -0700
Subject: [PATCH] Using 1ES template but defining the containers properly.

---
 .vsts-ci.yml | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index b585acce2..889faa993 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -47,10 +47,10 @@ resources:
     type: git
     name: 1ESPipelineTemplates/MicroBuildTemplate
     ref: refs/tags/release
-  # - repository: 1esPipelines
-  #   type: git
-  #   name: 1ESPipelineTemplates/1ESPipelineTemplates
-  #   ref: refs/tags/release
+  - repository: 1esPipelines
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
   # containers:
   # - container: MuslArm
   #   image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
@@ -62,7 +62,8 @@ resources:
   #   image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
 
 extends:
-  template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
+  # template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
   parameters:
     # containers:
     # - container: MuslArm
@@ -73,6 +74,15 @@ extends:
     #   image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
     # - container: PortableRpm
     #   image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
+    containers:
+      MuslArm:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
+      MuslX64:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+      PortableDeb:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
+      PortableRpm:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
     sdl:
       sourceAnalysisPool:
         name: $(DncEngInternalBuildPool)
@@ -149,8 +159,8 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_musl_Release_arm
-          # container: MuslArm
-          container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
+          container: MuslArm
+          # container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
           buildConfiguration: Release
           buildArchitecture: arm
           runtimeIdentifier: 'linux-musl-arm'
@@ -171,8 +181,8 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_musl_Release_x64
-          # container: MuslX64
-          container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+          container: MuslX64
+          # container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
           buildConfiguration: Release
           buildArchitecture: x64
           runtimeIdentifier: 'linux-musl-x64'
@@ -184,8 +194,8 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_Portable_Deb_Release_x64
-          # container: PortableDeb
-          container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
+          container: PortableDeb
+          # container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
           buildConfiguration: Release
           buildArchitecture: x64
           # Do not publish zips and tarballs. The linux-x64 binaries are
@@ -197,8 +207,8 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_Portable_Rpm_Release_x64
-          # container: PortableRpm
-          container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
+          container: PortableRpm
+          # container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
           buildConfiguration: Release
           buildArchitecture: x64
           # Do not publish zips and tarballs. The linux-x64 binaries are
@@ -210,8 +220,8 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_Portable_Rpm_Release_Arm64
-          # container: PortableRpm
-          container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
+          container: PortableRpm
+          # container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
           buildConfiguration: Release
           buildArchitecture: arm64
           runtimeIdentifier: 'linux-arm64'