Update pipeline definitions in response to changes

lbussell · lbussell · commit db08a65f6250 · 2025-07-21T14:23:15.000-07:00
diff --git a/eng/pipelines/dotnet-core-internal-nightly.yml b/eng/pipelines/dotnet-core-internal-nightly.yml
@@ -16,13 +16,6 @@ parameters:
   type: boolean
   default: false
 
-resources:
-  repositories:
-  - repository: InternalVersionsRepo
-    type: github
-    endpoint: dotnet
-    name: dotnet/dotnet-docker-internal
-
 variables:
 - template: /eng/pipelines/variables/internal-core.yml@self
 - name: officialBranches
@@ -39,6 +32,14 @@ variables:
   - name: publishRepoPrefix
     value: internal/private/
 
+resources:
+  repositories:
+  - repository: VersionsRepo
+    type: github
+    endpoint: dotnet
+    name: dotnet/dotnet-docker-internal
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
+
 extends:
   template: /eng/common/templates/1es-official.yml@self
   parameters:
@@ -47,3 +48,4 @@ extends:
       parameters:
         internalProjectName: ${{ variables.internalProjectName }}
         publicProjectName: ${{ variables.publicProjectName }}
+        versionsRepoRef: VersionsRepo
diff --git a/eng/pipelines/dotnet-core-internal-testing.yml b/eng/pipelines/dotnet-core-internal-testing.yml
@@ -10,13 +10,6 @@ trigger:
     - src/*
 pr: none
 
-resources:
-  repositories:
-  - repository: InternalVersionsRepo
-    type: github
-    endpoint: dotnet
-    name: dotnet/versions
-
 parameters:
 - name: sourceBuildPipelineRunId
   displayName: >
@@ -34,6 +27,14 @@ variables:
 - name: IsInternalServicingValidation
   value: true
 
+resources:
+  repositories:
+  - repository: VersionsRepo
+    type: github
+    endpoint: dotnet
+    name: dotnet/versions
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
+
 extends:
   template: /eng/common/templates/1es-official.yml@self
   parameters:
@@ -48,6 +49,7 @@ extends:
       parameters:
         internalProjectName: ${{ variables.internalProjectName }}
         publicProjectName: ${{ variables.publicProjectName }}
+        versionsRepoRef: VersionsRepo
         sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
         isInternalServicingValidation: ${{ variables.IsInternalServicingValidation }}
         noCache: true
diff --git a/eng/pipelines/dotnet-core-nightly-pr-no-cache.yml b/eng/pipelines/dotnet-core-nightly-pr-no-cache.yml
@@ -8,19 +8,21 @@ pr:
     - eng/*
     - tests/*
 
+variables:
+- template: variables/core.yml
+
 resources:
   repositories:
-  - repository: PublicVersionsRepo
+  - repository: VersionsRepo
     type: github
     endpoint: public
     name: dotnet/versions
-
-variables:
-- template: variables/core.yml
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
 
 stages:
 - template: stages/build-test-publish-repo.yml
   parameters:
     internalProjectName: ${{ variables.internalProjectName }}
     publicProjectName: ${{ variables.publicProjectName }}
+    versionsRepoRef: VersionsRepo
     noCache: true
diff --git a/eng/pipelines/dotnet-core-nightly-pr.yml b/eng/pipelines/dotnet-core-nightly-pr.yml
@@ -12,18 +12,20 @@ pr:
     - src/*
     - tests/*
 
+variables:
+- template: variables/core.yml
+
 resources:
   repositories:
-  - repository: PublicVersionsRepo
+  - repository: VersionsRepo
     type: github
     endpoint: public
     name: dotnet/versions
-
-variables:
-- template: variables/core.yml
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
 
 stages:
 - template: stages/build-test-publish-repo.yml
   parameters:
     internalProjectName: ${{ variables.internalProjectName }}
     publicProjectName: ${{ variables.publicProjectName }}
+    versionsRepoRef: VersionsRepo
diff --git a/eng/pipelines/dotnet-core-nightly.yml b/eng/pipelines/dotnet-core-nightly.yml
@@ -20,13 +20,6 @@ parameters:
   type: string
   default: $(Build.BuildId)
 
-resources:
-  repositories:
-  - repository: InternalVersionsRepo
-    type: github
-    endpoint: dotnet
-    name: dotnet/versions
-
 variables:
 - template: /eng/pipelines/variables/core.yml@self
   parameters:
@@ -35,6 +28,14 @@ variables:
   # comma-delimited list of branch names
   value: nightly
 
+resources:
+  repositories:
+  - repository: VersionsRepo
+    type: github
+    endpoint: dotnet
+    name: dotnet/versions
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
+
 extends:
   template: /eng/common/templates/1es-official.yml@self
   parameters:
@@ -49,4 +50,5 @@ extends:
       parameters:
         internalProjectName: ${{ variables.internalProjectName }}
         publicProjectName: ${{ variables.publicProjectName }}
+        versionsRepoRef: VersionsRepo
         sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
diff --git a/eng/pipelines/dotnet-core-pr.yml b/eng/pipelines/dotnet-core-pr.yml
@@ -11,18 +11,20 @@ pr:
     - src/*
     - tests/*
 
+variables:
+- template: variables/core.yml
+
 resources:
   repositories:
-  - repository: PublicVersionsRepo
+  - repository: VersionsRepo
     type: github
     endpoint: public
     name: dotnet/versions
-
-variables:
-- template: variables/core.yml
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
 
 stages:
 - template: stages/build-test-publish-repo.yml
   parameters:
     internalProjectName: ${{ variables.internalProjectName }}
     publicProjectName: ${{ variables.publicProjectName }}
+    versionsRepoRef: VersionsRepo
diff --git a/eng/pipelines/dotnet-core-samples-pr.yml b/eng/pipelines/dotnet-core-samples-pr.yml
@@ -11,18 +11,20 @@ pr:
     - samples/*
     - tests/*
 
+variables:
+- template: variables/samples.yml
+
 resources:
   repositories:
-  - repository: PublicVersionsRepo
+  - repository: VersionsRepo
     type: github
     endpoint: public
     name: dotnet/versions
-
-variables:
-- template: variables/samples.yml
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
 
 stages:
 - template: stages/build-test-publish-repo.yml
   parameters:
     internalProjectName: ${{ variables.internalProjectName }}
     publicProjectName: ${{ variables.publicProjectName }}
+    versionsRepoRef: VersionsRepo
diff --git a/eng/pipelines/dotnet-core-samples.yml b/eng/pipelines/dotnet-core-samples.yml
@@ -1,13 +1,6 @@
 trigger: none
 pr: none
 
-resources:
-  repositories:
-  - repository: InternalVersionsRepo
-    type: github
-    endpoint: dotnet
-    name: dotnet/versions
-
 parameters:
 - name: sourceBuildPipelineRunId
   displayName: >
@@ -23,6 +16,14 @@ variables:
   parameters:
     sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
 
+resources:
+  repositories:
+  - repository: VersionsRepo
+    type: github
+    endpoint: dotnet
+    name: dotnet/versions
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
+
 extends:
   template: /eng/common/templates/1es-official.yml@self
   parameters:
@@ -37,3 +38,4 @@ extends:
       parameters:
         internalProjectName: ${{ variables.internalProjectName }}
         publicProjectName: ${{ variables.publicProjectName }}
+        versionsRepoRef: VersionsRepo
diff --git a/eng/pipelines/dotnet-core.yml b/eng/pipelines/dotnet-core.yml
@@ -1,13 +1,6 @@
 trigger: none
 pr: none
 
-resources:
-  repositories:
-  - repository: InternalVersionsRepo
-    type: github
-    endpoint: dotnet
-    name: dotnet/versions
-
 parameters:
 - name: sourceBuildPipelineRunId
   displayName: >
@@ -23,6 +16,14 @@ variables:
   parameters:
     sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
 
+resources:
+  repositories:
+  - repository: VersionsRepo
+    type: github
+    endpoint: dotnet
+    name: dotnet/versions
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
+
 extends:
   template: /eng/common/templates/1es-official.yml@self
   parameters:
@@ -37,4 +38,5 @@ extends:
       parameters:
         internalProjectName: ${{ variables.internalProjectName }}
         publicProjectName: ${{ variables.publicProjectName }}
+        versionsRepoRef: VersionsRepo
         sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
diff --git a/eng/pipelines/release-promotion.yml b/eng/pipelines/release-promotion.yml
@@ -17,6 +17,14 @@ variables:
 - name: imageBuilder.queueArgs
   value: ""
 
+resources:
+  repositories:
+  - repository: VersionsRepo
+    type: github
+    endpoint: dotnet
+    name: dotnet/versions
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
+
 extends:
   template: /eng/common/templates/1es-official.yml@self
   parameters:
@@ -30,6 +38,7 @@ extends:
       parameters:
         internalProjectName: ${{ variables.internalProjectName }}
         publicProjectName: ${{ variables.publicProjectName }}
+        versionsRepoRef: VersionsRepo
         isStandalonePublish: true
         sourceBuildPipelineDefinitionId: "$(resources.pipeline.dotnet-docker-release-staging.pipelineID)"
         sourceBuildPipelineRunId: "$(resources.pipeline.dotnet-docker-release-staging.runID)"
diff --git a/eng/pipelines/release-staging.yml b/eng/pipelines/release-staging.yml
@@ -6,13 +6,6 @@
 trigger: none
 pr: none
 
-resources:
-  repositories:
-  - repository: InternalVersionsRepo
-    type: github
-    endpoint: dotnet
-    name: dotnet/versions
-
 parameters:
 - name: sourceBuildPipelineRunId
   displayName: >
@@ -28,6 +21,14 @@ variables:
   parameters:
     sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
 
+resources:
+  repositories:
+  - repository: VersionsRepo
+    type: github
+    endpoint: dotnet
+    name: dotnet/versions
+    ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }}
+
 extends:
   template: /eng/common/templates/1es-official.yml@self
   parameters:
@@ -40,6 +41,7 @@ extends:
       parameters:
         internalProjectName: ${{ variables.internalProjectName }}
         publicProjectName: ${{ variables.publicProjectName }}
+        versionsRepoRef: VersionsRepo
         sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
         isInternalServicingValidation: true
         # We always want staged images to be as up-to-date as possible,
diff --git a/eng/pipelines/stages/build-and-test.yml b/eng/pipelines/stages/build-and-test.yml
@@ -8,6 +8,7 @@ parameters:
   linuxAmd64Pool: ""
   isInternalServicingValidation: false
   sourceBuildPipelineRunId: ""
+  versionsRepoRef: ""
 
 stages:
 - template: /eng/common/templates/stages/dotnet/build-and-test.yml@self
diff --git a/eng/pipelines/stages/build-test-publish-repo.yml b/eng/pipelines/stages/build-test-publish-repo.yml
@@ -11,6 +11,7 @@ parameters:
   linuxAmd64Pool: ""
   isInternalServicingValidation: false
   sourceBuildPipelineRunId: ""
+  versionsRepoRef: ""
 
 stages:
 - template: /eng/pipelines/stages/build-and-test.yml@self
@@ -20,6 +21,7 @@ stages:
   parameters:
     internalProjectName: ${{ parameters.internalProjectName }}
     publicProjectName: ${{ parameters.publicProjectName }}
+    versionsRepoRef: ${{ parameters.versionsRepoRef }}
     linuxAmd64Pool: ${{ parameters.linuxAmd64Pool }}
     isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
     sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
diff --git a/eng/pipelines/stages/publish.yml b/eng/pipelines/stages/publish.yml
@@ -26,12 +26,16 @@ parameters:
   - name: sourceBuildPipelineRunId
     type: string
     default: ''
+  - name: versionsRepoRef
+    type: string
+    default: ''
 
 stages:
 - template: /eng/common/templates/stages/dotnet/publish.yml@self
   parameters:
     internalProjectName: ${{ parameters.internalProjectName }}
     publicProjectName: ${{ parameters.publicProjectName }}
+    versionsRepoRef: ${{ parameters.versionsRepoRef }}
     isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
     isStandalonePublish: ${{ parameters.isStandalonePublish }}
     pool: ${{ parameters.linuxAmd64Pool }}
