Trying to add an ubuntu run.

dotnet · ViktorHofer · May 22, 2024 · May 3, 2024 · May 3, 2024 · May 3, 2024
commit be2f78005cc859b9c00d5361f9a1f8cdc81a022d
@@ -58,6 +58,23 @@ extends:
   ${{ else }}:
     template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
   parameters:
+    containers:
+      alpine319WithNode:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+      cblMariner20Fpm:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
+      centosStream9:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
+      debian11Amd64:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
+      fedora39:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
+      ubuntu2204:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
+      mariner20CrossArm:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
+      ubuntu2204DebPkg:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
     sdl:
       sourceAnalysisPool:
         name: $(DncEngInternalBuildPool)
@@ -93,7 +110,7 @@ extends:
       #       container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
 
 
-      #################### BUILD ####################
+      ############### WINDOWS ###############
       - template: /eng/pipelines/templates/jobs/sdk-build.yml@self
         parameters:
           pool:
@@ -243,69 +260,53 @@ extends:
       #       - name: _Test
       #         value: -test
 
-
-      # - template: /eng/pipelines/templates/jobs/sdk-build.yml@self
-      #   parameters:
-      #     pool:
-      #       name: $(DncEngInternalBuildPool)
-      #       image: 1es-ubuntu-2204
-      #       os: linux
-      #     helixTargetQueue: ubuntu.2204.amd64
-      #     oneEsPtCompat:
-      #       jobTemplatePath: /eng/common/templates-official/job/job.yml
-      #       publishTaskName: 1ES.PublishBuildArtifacts@1
-      #     variables:
-      #       runTests: ${{ parameters.runTests }}
-      #       # Setting this here once so it can be reused in the matrix only.
-      #       _officialBuildProperties: /p:DotNetPublishUsingPipelines=true /p:OfficialBuilder=Microsoft /p:OfficialBuildId=$(Build.BuildNumber) /p:DotNetSignType=$(_SignType) /p:TeamName=DotNetCore
-      #     containers:
-      #       alpine319WithNode:
-      #         image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
-      #       cblMariner20Fpm:
-      #         image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
-      #       centosStream9:
-      #         image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
-      #       debian11Amd64:
-      #         image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
-      #       fedora39:
-      #         image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
-      #       ubuntu2204:
-      #         image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
-      #       mariner20CrossArm:
-      #         image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
-      #       ubuntu2204DebPkg:
-      #         image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
-      #     strategy:
-      #       matrix:
-      #         ${{ if and(eq(parameters.runTests, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
-      #           Official:
-      #             publishArgument: -publish
-      #             _SignType: real
-      #             officialBuildProperties: $(_officialBuildProperties)
-      #           Official_x86:
-      #             buildArchitecture: x86
-      #             publishArgument: -publish
-      #             _SignType: real
-      #             officialBuildProperties: $(_officialBuildProperties)
-      #           Official_arm64:
-      #             buildArchitecture: arm64
-      #             publishArgument: -publish
-      #             _SignType: real
-      #             officialBuildProperties: $(_officialBuildProperties)
-      #         ${{ else }}:
-      #           Test: {}
-      #           FullFramework:
-      #             testFullMSBuild: true
-      #           TestAsTools:
-      #             testInBuildProperties: /p:RunTestsAsTool=true
-      #             # This uses the build step for testing, so the extra test step is not necessary.
-      #             runTests: false
-      #           TemplateEngine:
-      #             testName: TemplateEngineTests
-      #             testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;
-      #               $(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
-      #           AoT:
-      #             runAoTTests: true
+      ############### NON-WINDOWS ###############
+      - template: /eng/pipelines/templates/jobs/sdk-build.yml@self
+        parameters:
+          pool:
+            name: $(DncEngInternalBuildPool)
+            image: 1es-ubuntu-2204
+            os: linux
+          helixTargetQueue: ubuntu.2204.amd64
+          container: ubuntu2204
+          oneEsPtCompat:
+            jobTemplatePath: /eng/common/templates-official/job/job.yml
+            publishTaskName: 1ES.PublishBuildArtifacts@1
+          variables:
+            runTests: ${{ parameters.runTests }}
+            # Setting this here once so it can be reused in the matrix only.
+            _officialBuildProperties: /p:DotNetPublishUsingPipelines=true /p:OfficialBuilder=Microsoft /p:OfficialBuildId=$(Build.BuildNumber)
+          strategy:
+            matrix:
+              ${{ if and(eq(parameters.runTests, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
+                Official:
+                  publishArgument: -publish
+                  _SignType: real
+                  officialBuildProperties: $(_officialBuildProperties)
+                Official_x86:
+                  buildArchitecture: x86
+                  publishArgument: -publish
+                  _SignType: real
+                  officialBuildProperties: $(_officialBuildProperties)
+                Official_arm64:
+                  buildArchitecture: arm64
+                  publishArgument: -publish
+                  _SignType: real
+                  officialBuildProperties: $(_officialBuildProperties)
+              # ${{ else }}:
+              #   Test: {}
+              #   FullFramework:
+              #     testFullMSBuild: true
+              #   TestAsTools:
+              #     testInBuildProperties: /p:RunTestsAsTool=true
+              #     # This uses the build step for testing, so the extra test step is not necessary.
+              #     runTests: false
+              #   TemplateEngine:
+              #     testName: TemplateEngineTests
+              #     testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;
+              #       $(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
+              #   AoT:
+              #     runAoTTests: true
 
 
 

@@ -3,13 +3,16 @@ parameters:
     jobTemplatePath: /eng/common/templates/job/job.yml
     publishTaskName: PublishBuildArtifacts@1
   buildScriptPath: eng/common/build.ps1
+  container: ''
 
 jobs:
 - template: ${{ parameters.oneEsPtCompat.jobTemplatePath }}
   parameters:
     name: ${{ parameters.pool.os }}
     displayName: ${{ parameters.pool.os }}
     pool: ${{ parameters.pool }}
+    # ${{ if ne(parameters.container, '') }}:
+    container: ${{ parameters.container }}
     strategy: ${{ parameters.strategy }}
     helixRepo: dotnet/sdk
     timeoutInMinutes: 180