Simplify pool.yml template chain

eng/_util/go.mod

@@ -8,7 +8,7 @@ go 1.25.0
 
 require (
 	github.com/golang-jwt/jwt/v5 v5.3.1
-	github.com/microsoft/go-infra v0.0.10-0.20260411064856-24be3e9cffcc
+	github.com/microsoft/go-infra v0.0.10-0.20260420165249-d41a92f0b571
 	github.com/microsoft/go-infra/goinstallscript v1.2.0
 	golang.org/x/net v0.53.0
 )

eng/_util/go.sum

@@ -31,8 +31,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5 h1:YH424zrwLTlyHSH/GzLMJeu5zhYVZSx5RQxGKm1h96s=
 github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5/go.mod h1:PoGiBqKSQK1vIfQ+yVaFcGjDySHvym6FM1cNYnwzbrY=
-github.com/microsoft/go-infra v0.0.10-0.20260411064856-24be3e9cffcc h1:30J8WxjqbdWfBhQ1e3qoWFCj/nzySj6BfpHTbCkj62s=
-github.com/microsoft/go-infra v0.0.10-0.20260411064856-24be3e9cffcc/go.mod h1:DST10Gfood7K6NWquhn+jY3/NABtvlyeRjG5oEFNiVE=
+github.com/microsoft/go-infra v0.0.10-0.20260420165249-d41a92f0b571 h1:9FWo2PHJ6HGLPYF4VP6DupIeA0YN39xg9c4hnn75L+E=
+github.com/microsoft/go-infra v0.0.10-0.20260420165249-d41a92f0b571/go.mod h1:DST10Gfood7K6NWquhn+jY3/NABtvlyeRjG5oEFNiVE=
 github.com/microsoft/go-infra/goinstallscript v1.2.0 h1:ArYnZHsmv0jnpeDZdFACBUxSmhmYl+Vof8sfk19aYZI=
 github.com/microsoft/go-infra/goinstallscript v1.2.0/go.mod h1:SFsdKAEHdmGsGoh8FkksVaxoQ3rnnJ/TBqN09Ml/0Cw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=

eng/pipeline/data/containers.yml

@@ -0,0 +1,10 @@
+# Containers used in pipelines. This data template can be used with pipelineymlgen
+# to generate the right format for "real" AzDO pipelines and 1ES pipelines.
+- container: ubuntu2204
+  image: mcr.microsoft.com/microsoft-go/infra-images:ubuntu-22.04-amd64-default
+- container: mariner2
+  image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-amd64-default
+- container: mariner2arm64
+  image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default
+- container: azurelinux3
+  image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default

eng/pipeline/pr-outerloop-pipeline.yml

@@ -1,26 +1,25 @@
+# Code generated by pipelineymlgen; DO NOT EDIT.
+# Origin file: pr.gen.yml
+
 # Copyright (c) Microsoft Corporation.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# This pipeline can be triggered via PR comment to run outerloop builders.
+# PR validation pipelines: innerloop and outerloop.
+# The outerloop pipeline can be triggered via PR comment to run outerloop builders.
+# The outerloop pipeline definition must be adjusted using the AzDO UI to require
+# a comment before running the build. There is unfortunately no way to configure
+# this from YAML.
 
-# https://dev.azure.com/dnceng-public/public/_build?definitionId=192
+# innerloop: https://dev.azure.com/dnceng-public/public/_build?definitionId=191
+# outerloop: https://dev.azure.com/dnceng-public/public/_build?definitionId=192
 
 trigger: none
 pr:
-  # Configure this pipeline to *potentially* run on any Microsoft-maintained branch. The pattern
-  # allows commands like "/azp run" to find this pipeline.
-  #
-  # Note: if all we did was configure "pr:", this pipeline would be triggered *by default* on any
-  # new PR. To make the pipeline run on demand, the pipeline definition must be adjusted using the
-  # AzDO UI to require a comment before running the build. There is unfortunately no way to
-  # configure this from YAML.
   - microsoft/*
   - dev/*
-
 variables:
   - template: variables/pipeline.yml
-
 resources:
   containers:
     - container: ubuntu2204
@@ -31,7 +30,6 @@ resources:
       image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default
     - container: azurelinux3
       image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default
-
 stages:
   - template: stages/go-builder-matrix-stages.yml
     parameters:

eng/pipeline/pr-pipeline.yml

@@ -1,25 +1,27 @@
+# Code generated by pipelineymlgen; DO NOT EDIT.
+# Origin file: pr.gen.yml
+
 # Copyright (c) Microsoft Corporation.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# This pipeline validates PRs. It builds Go and runs inner loop tests.
+# PR validation pipelines: innerloop and outerloop.
+# The outerloop pipeline can be triggered via PR comment to run outerloop builders.
+# The outerloop pipeline definition must be adjusted using the AzDO UI to require
+# a comment before running the build. There is unfortunately no way to configure
+# this from YAML.
 
-# https://dev.azure.com/dnceng-public/public/_build?definitionId=191
+# innerloop: https://dev.azure.com/dnceng-public/public/_build?definitionId=191
+# outerloop: https://dev.azure.com/dnceng-public/public/_build?definitionId=192
 
 trigger: none
 pr:
   - microsoft/*
   - dev/*
-
 variables:
   - template: variables/pipeline.yml
-
 resources:
   containers:
-    # Predefine named containers. Using "container:" inside the job would work, because this is not
-    # 1ES PT. However, to share code, use the same names here. Unfortunately the format used here
-    # (container: ... image: ...) is not the same as the one 1ES PT uses, so updating these requires
-    # separate changes.
     - container: ubuntu2204
       image: mcr.microsoft.com/microsoft-go/infra-images:ubuntu-22.04-amd64-default
     - container: mariner2
@@ -28,7 +30,6 @@ resources:
       image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default
     - container: azurelinux3
       image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default
-
 stages:
   - template: stages/go-builder-matrix-stages.yml
     parameters:

eng/pipeline/pr.gen.yml

@@ -0,0 +1,49 @@
+# Copyright (c) Microsoft Corporation.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# PR validation pipelines: innerloop and outerloop.
+# The outerloop pipeline can be triggered via PR comment to run outerloop builders.
+# The outerloop pipeline definition must be adjusted using the AzDO UI to require
+# a comment before running the build. There is unfortunately no way to configure
+# this from YAML.
+
+# innerloop: https://dev.azure.com/dnceng-public/public/_build?definitionId=191
+# outerloop: https://dev.azure.com/dnceng-public/public/_build?definitionId=192
+
+pipelineymlgen:
+  data:
+    containers:
+      ${ inlinetemplate "data/containers.yml" }
+  output:
+    - file: pr-pipeline.yml
+      data:
+        outerloop: false
+    - file: pr-outerloop-pipeline.yml
+      data:
+        outerloop: true
+---
+
+trigger: none
+pr:
+  - microsoft/*
+  - dev/*
+
+variables:
+  - template: variables/pipeline.yml
+
+resources:
+  containers:
+    - ${ inlinerange .containers }:
+      - container: ${ .container }
+        image: ${ .image }
+
+stages:
+  - template: stages/go-builder-matrix-stages.yml
+    parameters:
+      ctx: {}
+      ${ inlineif .outerloop }:
+        outerloop: true
+      ${ inlineelse }:
+        innerloop: true
+        buildandpack: true

eng/pipeline/rolling-innerloop-pipeline.yml

@@ -1,11 +1,17 @@
+# Code generated by pipelineymlgen; DO NOT EDIT.
+# Origin file: rolling.gen.yml
+
 # Copyright (c) Microsoft Corporation.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# This pipeline runs innerloop (reliable, relatively quick) tests on rolling builds.
-# The intent is that if this pipeline fails, it should block official release for a good reason.
+# Rolling test pipelines: innerloop and outerloop.
+# The innerloop pipeline runs reliable, relatively quick tests.
+# If the innerloop pipeline fails, it should block official release for a good reason.
+# The outerloop pipeline runs tests that may be unreliable or very slow.
 
-# https://dev.azure.com/dnceng/internal/_build?definitionId=1342
+# innerloop: https://dev.azure.com/dnceng/internal/_build?definitionId=1342
+# outerloop: https://dev.azure.com/dnceng/internal/_build?definitionId=987
 
 trigger:
   batch: true
@@ -14,24 +20,20 @@ trigger:
       - microsoft/*
       - dev/official/*
 pr: none
-
 parameters:
   # By default, don't use the shared, potentially constrained linux-arm64 pool.
   - name: includeArm64Host
     displayName: 'Include Linux arm64 host builders'
     type: boolean
     default: false
-
 variables:
   - template: variables/pipeline.yml
-
 resources:
   repositories:
     - repository: 1ESPipelineTemplates
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release
-
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
@@ -51,7 +53,6 @@ extends:
         image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default
       azurelinux3:
         image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default
-
     stages:
       - template: stages/go-builder-matrix-stages.yml
         parameters:

eng/pipeline/rolling-pipeline.yml

@@ -1,11 +1,17 @@
+# Code generated by pipelineymlgen; DO NOT EDIT.
+# Origin file: rolling.gen.yml
+
 # Copyright (c) Microsoft Corporation.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# This pipeline runs rolling builders that include tests that may be unreliable or very slow.
-# If a test is reliable/fast, it should be run by rolling-innerloop-pipeline.yml.
+# Rolling test pipelines: innerloop and outerloop.
+# The innerloop pipeline runs reliable, relatively quick tests.
+# If the innerloop pipeline fails, it should block official release for a good reason.
+# The outerloop pipeline runs tests that may be unreliable or very slow.
 
-# https://dev.azure.com/dnceng/internal/_build?definitionId=987
+# innerloop: https://dev.azure.com/dnceng/internal/_build?definitionId=1342
+# outerloop: https://dev.azure.com/dnceng/internal/_build?definitionId=987
 
 trigger:
   batch: true
@@ -14,17 +20,14 @@ trigger:
       - microsoft/*
       - dev/official/*
 pr: none
-
 variables:
   - template: variables/pipeline.yml
-
 resources:
   repositories:
     - repository: 1ESPipelineTemplates
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release
-
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
@@ -44,7 +47,6 @@ extends:
         image: mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default
       azurelinux3:
         image: mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default
-
     stages:
       - template: stages/go-builder-matrix-stages.yml
         parameters:

eng/pipeline/rolling.gen.yml

@@ -0,0 +1,78 @@
+# Copyright (c) Microsoft Corporation.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# Rolling test pipelines: innerloop and outerloop.
+# The innerloop pipeline runs reliable, relatively quick tests.
+# If the innerloop pipeline fails, it should block official release for a good reason.
+# The outerloop pipeline runs tests that may be unreliable or very slow.
+
+# innerloop: https://dev.azure.com/dnceng/internal/_build?definitionId=1342
+# outerloop: https://dev.azure.com/dnceng/internal/_build?definitionId=987
+
+pipelineymlgen:
+  data:
+    containers:
+      ${ inlinetemplate "data/containers.yml" }
+  output:
+    - file: rolling-innerloop-pipeline.yml
+      data:
+        innerloop: true
+    - file: rolling-pipeline.yml
+      data:
+        innerloop: false
+---
+
+trigger:
+  batch: true
+  branches:
+    include:
+      - microsoft/*
+      - dev/official/*
+pr: none
+
+${ inlineif .innerloop }:
+  parameters:
+    # By default, don't use the shared, potentially constrained linux-arm64 pool.
+    - name: includeArm64Host
+      displayName: 'Include Linux arm64 host builders'
+      type: boolean
+      default: false
+
+variables:
+  - template: variables/pipeline.yml
+
+resources:
+  repositories:
+    - repository: 1ESPipelineTemplates
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    sdl:
+      sourceAnalysisPool:
+        name: NetCore1ESPool-Internal
+        image: 1es-windows-2022
+        os: windows
+      suppression:
+        suppressionFile: $(Build.SourcesDirectory)/.config/guardian/.gdnsuppress
+    containers:
+      ${ inlinerange .containers }:
+        ${ .container }:
+          image: ${ .image }
+
+    stages:
+      - template: stages/go-builder-matrix-stages.yml
+        parameters:
+          ctx: {}
+          ${ inlineif .innerloop }:
+            innerloop: true
+            # Include buildandpack builders. The official internal build uses slightly different build
+            # machines than this pipeline. This one tests against our minimum requirements.
+            buildandpack: true
+            includeArm64Host: ${{ parameters.includeArm64Host }}
+          ${ inlineelse }:
+            outerloop: true