Update release staging pipeline to allow internal builds (#6485)

Co-authored-by: Matt Thalman <mthalman@microsoft.com>

Author: lbussell

eng/pipelines/release-staging.yml

@@ -13,20 +13,35 @@ resources:
     endpoint: dotnet
     name: dotnet/versions
 
+parameters:
+- name: sourceBuildPipelineRunId
+  displayName: >
+    Source build pipeline run ID. This refers to runs of *this pipeline*.
+    Override this parameter in combination with disabling the `Build` stage to
+    test images that were built in a different pipeline run. When
+    building new images, leave this value alone.
+  type: string
+  default: $(Build.BuildId)
+
 variables:
 - template: /eng/pipelines/variables/core.yml@self
+  parameters:
+    sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
 
 extends:
   template: /eng/common/templates/1es-official.yml@self
   parameters:
     serviceConnections:
     - name: $(internal-mirror.serviceConnectionName)
     - name: $(build.serviceConnectionName)
+    - name: $(dotnetstaging.serviceConnectionName)
     stages:
     - template: /eng/pipelines/stages/build-and-test.yml@self
       parameters:
         internalProjectName: ${{ variables.internalProjectName }}
         publicProjectName: ${{ variables.publicProjectName }}
+        sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
+        isInternalServicingValidation: true
         # We always want staged images to be as up-to-date as possible,
         # so don't rely on any caching behavior.
         noCache: true

eng/pipelines/stages/build-and-test.yml

@@ -14,7 +14,7 @@ stages:
   parameters:
     ${{ insert }}: ${{ parameters }}
 
-    ${{ if or(eq(variables['System.TeamProject'], parameters.publicProjectName), and(eq(variables['System.TeamProject'], parameters.internalProjectName), or(eq(variables['Build.Reason'], 'PullRequest'), eq(parameters.isInternalServicingValidation, 'true')))) }}:
+    ${{ if or(eq(variables['System.TeamProject'], parameters.publicProjectName), and(eq(variables['System.TeamProject'], parameters.internalProjectName), eq(variables['Build.Reason'], 'PullRequest'))) }}:
       buildMatrixType: platformVersionedOs
       buildMatrixCustomBuildLegGroupArgs: --custom-build-leg-group pr-build --custom-build-leg-group test-dependencies
     ${{ elseif eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
@@ -25,14 +25,15 @@ stages:
     - template: /eng/pipelines/steps/set-public-source-branch-var.yml@self
     customBuildInitSteps:
     - template: /eng/pipelines/steps/set-public-source-branch-var.yml@self
-    - powershell: |
-        $imageBuilderBuildArgs = "$IMAGEBUILDERBUILDARGS"
-        if ("${{ parameters.IsInternalServicingValidation }}" -eq "true") {
-          $accessToken = "$(System.AccessToken)"
-          $imageBuilderBuildArgs += " --build-arg ACCESSTOKEN='$accessToken'"
-        }
-        echo "##vso[task.setvariable variable=imageBuilderBuildArgs]$imageBuilderBuildArgs"
-      displayName: Set Custom Build Variables
+    - ${{ if eq(parameters.isInternalServicingValidation, true) }}:
+      - powershell: |
+          $imageBuilderBuildArgs = "$IMAGEBUILDERBUILDARGS --internal"
+          echo "##vso[task.setvariable variable=imageBuilderBuildArgs]$imageBuilderBuildArgs"
+        displayName: Set Custom Build Variables
     - template: /eng/pipelines/steps/set-custom-test-variables.yml@self
+      parameters:
+        isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
     customTestInitSteps:
     - template: /eng/pipelines/steps/set-custom-test-variables.yml@self
+      parameters:
+        isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}

eng/pipelines/steps/set-custom-test-variables.yml

@@ -1,3 +1,6 @@
+parameters:
+  isInternalServicingValidation: false
+
 steps:
 - powershell: |
     # Use public cache registry for pulling external images during tests
@@ -7,7 +10,7 @@ steps:
     $testRunnerOptions="-e SYSTEM_TEAMPROJECT='$env:SYSTEM_TEAMPROJECT'"
     $testInit=""
 
-    if ("$(publishRepoPrefix)".Contains("internal/")) {
+    if (("$(publishRepoPrefix)".Contains("internal/")) -or $${{ parameters.isInternalServicingValidation }}) {
       if ($Env:AGENT_OS -eq 'Linux') {
         $testRunnerOptions="$testRunnerOptions -e INTERNAL_TESTING='1' -e INTERNAL_ACCESS_TOKEN='$(System.AccessToken)'"
       }
@@ -19,7 +22,7 @@ steps:
           $testInit='$Env:INTERNAL_TESTING=''1'' ; $Env:INTERNAL_ACCESS_TOKEN=''$(System.AccessToken)'''
       }
     }
-    
+
     echo "##vso[task.setvariable variable=additionalTestArgs]$additionalTestArgs"
     echo "##vso[task.setvariable variable=testRunner.options]$testRunnerOptions"
     echo "##vso[task.setvariable variable=test.init]$testInit"

tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs

@@ -158,6 +158,14 @@ public void VerifyPowerShellScenario_NonDefaultUser(ProductImageData imageData)
         [MemberData(nameof(GetImageData))]
         public async Task VerifyDotnetFolderContents(ProductImageData imageData)
         {
+            if (Config.IsInternal)
+            {
+                // Skip this test for internal builds, since this test does not
+                // yet authenticate to download the internal staged version of
+                // the .NET SDK.
+                return;
+            }
+
             IEnumerable<SdkContentFileInfo> actualDotnetFiles = GetActualSdkContents(imageData);
             IEnumerable<SdkContentFileInfo> expectedDotnetFiles = await GetExpectedSdkContentsAsync(imageData);