Move Apex tests to DartLab on CloudTest (#6966)

zivkan · web-flow · commit 663b89f727e1 · 2025-11-26T07:54:07.000+10:30
diff --git a/eng/pipelines/dailytests.yml b/eng/pipelines/dailytests.yml
@@ -7,21 +7,14 @@ trigger:
     - dev
 
 parameters:
-# Dartlab options
-- name: DartLabEnvironment
-  displayName: DartLab Environment
-  type: string
-  default: Production
-  values:
-  - Production
-  - Staging
 - name: ApexAgentCleanup
-  displayName: Delete or keep VS Apex test machine for debugging
+  displayName: Cleanup VS Apex test machine
   type: string
-  default: delete
+  default: Always
   values:
-  - delete
-  - stop
+    - Always
+    - Never
+    - OnSuccess
 
 resources:
   pipelines:
@@ -58,19 +51,14 @@ stages:
     dependsOn:
     - Build
     variables:
-    - name: VsBootstrapperUrl
+    - name: bootstrapperUrl
       value: $[stageDependencies.Build.Build.outputs['dartlab_variables.bootstrapperUrl']]
-    - name: VsBaseBuildDrop
-      value: $[stageDependencies.Build.Build.outputs['dartlab_variables.BaseBuildDrop']]
-    - name: QBuildSessionId
-      value: $[stageDependencies.Build.Build.outputs['dartlab_variables.QBuildSessionId']]
     - name: RunSettingsDrop
       value: $[stageDependencies.Build.Build.outputs['dartlab_variables.RunSettingsDrop']]
-    baseBuildDrop: $(VsBaseBuildDrop)
-    bootstrapperUrl: $(VsBootstrapperUrl)
-    dartLabEnvironment: ${{parameters.DartLabEnvironment}}
-    isOfficialBuild: false
-    QBuildSessionId: $(QBuildSessionId)
+    - name: VsBootstrapperBranch
+      value: $[stageDependencies.Build.Build.outputs['dartlab_variables.VsBootstrapperBranch']]
+    bootstrapperUrl: $(bootstrapperUrl)
     runSettingsURI: https://vsdrop.corp.microsoft.com/file/v1/$(RunSettingsDrop);NuGet.Tests.Apex.Daily.runsettings
     testExecutionJobTimeoutInMinutes: 150
-    testMachineCleanUpStrategy: ${{parameters.ApexAgentCleanup}}
+    testDeploymentCleanupMode: ${{parameters.ApexAgentCleanup}}
+    VsBootstrapperBranch: $(VsBootstrapperBranch)
diff --git a/eng/pipelines/vs-test/apex.yml b/eng/pipelines/vs-test/apex.yml
@@ -3,144 +3,65 @@ parameters:
     type: object
   - name: bootstrapperUrl
     type: string
-  - name: baseBuildDrop
-    type: string
   - name: runSettingsURI
     type: string
-  - name: DartLabEnvironment
+  - name: VsBootstrapperBranch
     type: string
   - name: condition
     type: string
   - name: variables
     type: object
   - name: testExecutionJobTimeoutInMinutes
     type: number
-  - name: testMachineCleanUpStrategy
+  - name: testDeploymentCleanupMode
     type: string
-    default: delete
+    default: OnSuccess
     values:
-      - delete
-      - stop
-  - name: isOfficialBuild
-    type: boolean
-    default: false
-  - name: QBuildSessionId
-    type: string
+      - Always
+      - Never
+      - OnSuccess
 
 stages:
-  - template: stages\visual-studio\build-to-build-upgrade\single-runsettings.yml@DartLabTemplates
+  - template: stages/cloudtest/visual-studio/single-runsettings.yml@DartLabTemplates
     parameters:
       name: VS_Apex_Tests
       displayName: Apex Tests On Windows
       condition: ${{parameters.condition}}
       dependsOn: ${{parameters.dependsOn}}
       variables:
-        - name: bootstrapperUrl
-          value: ${{parameters.bootstrapperUrl}}
         - ${{if gt(length(parameters.variables), 0)}}:
           - ${{parameters.variables}}
+      owner: nugetclienteng
+      testMachineLab: "NuGet"
       runSettingsURI: ${{parameters.runSettingsURI}}
-      visualStudioBootstrapperURI: $(bootstrapperUrl)
-      baseVisualStudioBootstrapperURI: https://vsdrop.microsoft.com/file/v1/$(VisualStudio.BaseBuild.ProductsDropName);bootstrappers/Enterprise/vs_enterprise.exe
-      candidateBaselineBuilds: $(BaselineBuildCommitIds)
-      testLabPoolName: VS-Platform
-      dartLabEnvironment: ${{parameters.DartLabEnvironment}}
+      visualStudioBootstrapperURI: ${{parameters.bootstrapperUrl}}
       visualStudioSigning: Test
       testMachineConfigurationJobTimeoutInMinutes: 30
-      testMachineDeploymentJobTimeoutInMinutes: 240
       testMachineConfigurationJobDisplayName: 'Apex Test Machine Configuration'
-      testMachineDeploymentJobDisplayName: 'Apex Test Machine Deployment'
       testExecutionJobDisplayName: 'Apex Test Execution'
-      testMachineCleanUpJobDisplayName: 'Apex Test Machine Clean Up'
-      testRunContinueOnError: ${{ parameters.isOfficialBuild }}
       testExecutionJobTimeoutInMinutes: ${{parameters.testExecutionJobTimeoutInMinutes}}
-      testMachineCleanUpStrategy: ${{parameters.testMachineCleanUpStrategy}}
-      testAgentElevated: true
+      testDeploymentCleanupMode: ${{parameters.testDeploymentCleanupMode}}
+      testMachineConfigurationJobVariables:
+      - name: VisualStudio.InstallationUnderTest.BootstrapperBranch
+        value: ${{parameters.VsBootstrapperBranch}}
 
 ##############################
-## preTestMachineConfigurationStepList
+## preDeployAndRunTestsOperations
 ##############################
-      preTestMachineConfigurationStepList:
-        - template: \steps\powershell\execute-script.yml@DartLabTemplates
-          parameters:
-            displayName: Get Baseline Build ID using CloudBuild Session ID
-            continueOnError: true
-            filePath: $(DartLab.Path)\Scripts\AzureDevOps\Build\Get-BuildIdFromCloudBuildSessionID.ps1
-            arguments: -ClientSecret (ConvertTo-SecureString '$(CloudBuild-ClientSecret)' -AsPlainText -Force) -ClientID '$(CloudBuild-ClientID)' -SessionID '${{ parameters.QBuildSessionId }}' -OutVariableName 'BaselineBuildID'
-
-        - task: PowerShell@2
-          displayName: "Get Baseline build commit ids"
-          name: "getbaselinebuildcommitids"
-          retryCountOnTaskFailure: 3
-          continueOnError: true
-          inputs:
-            targetType: 'inline'
-            script: |
-              try {
-              Write-Host "Getting Baseline build commit ids for build: '$(BaselineBuildID)'"
-
-              $artifactName = 'BuildArtifacts'
-              $baselineBuildsFile = Join-Path $(Agent.TempDirectory) "BaselineBuilds.json"
-
-              $artifact = Get-BuildArtifact -InstanceURL 'https://dev.azure.com/devdiv' -ProjectName 'DevDiv' -BuildID $(BaselineBuildID)  -ArtifactName $artifactName -OAuthAccessToken (ConvertTo-SecureString '$(System.AccessToken)' -AsPlainText -Force)
-              $containerName = $artifact.Resource.Data -Split '/' | Select-Object -Last 1
-              $fileName = Join-Path $containerName 'BaselineBuilds.json'
-              $jsonString = Read-BuildArtifactFile -InstanceURL 'https://dev.azure.com/devdiv' -ProjectName 'DevDiv' -BuildID $(BaselineBuildID) -ArtifactName $artifactName -FileName $fileName -OAuthAccessToken (ConvertTo-SecureString '$(System.AccessToken)' -AsPlainText -Force)
-
-              $jsonString | Out-File -FilePath $baselineBuildsFile
-
-              $(DartLab.Path)\Scripts\VisualStudio\Build\Get-BaselineBuildCommitIDs.ps1 -BuildJson $baselineBuildsFile -OutVariableName "BaselineBuildCommitIds"
-              } catch {
-                Write-Host "Unable to get Baseline build commit ids: $_"
-              }
-        - task: PowerShell@2
-          name: SetVisualStudioBaseBuildID
-          displayName: Set 'VisualStudio.BaseBuild.ID'
-          retryCountOnTaskFailure: 3
-          condition: ne(variables['BaselineBuildCommitIds'], '')
-          continueOnError: true
-          inputs:
-            filePath: $(DartLab.Path)\Scripts\VisualStudio\Build\Get-BaselineBuildID.ps1
-            arguments: -OAuthAccessToken (ConvertTo-SecureString '$(System.AccessToken)' -AsPlainText -Force) -InstanceURL '$(System.CollectionUri)' -RepositoryName 'VS' -ProjectName '$(System.TeamProject)' -CommitIDs $(BaselineBuildCommitIds) -BuildDefinitionIDs 10289 -OutVariableName 'VisualStudio.BaseBuild.ID'
-        - task: PowerShell@2
-          name: SetVisualStudioBaseBuildProductsDropName
-          displayName: Set 'VisualStudio.BaseBuild.ProductsDropName'
-          retryCountOnTaskFailure: 3
-          condition: ne(variables['VisualStudio.BaseBuild.ID'], '')
-          inputs:
-            filePath: $(DartLab.Path)\Scripts\VisualStudio\Build\Get-VisualStudioDropName.ps1
-            arguments: -AccessToken (ConvertTo-SecureString '$(System.AccessToken)' -AsPlainText -Force) -DropNamePrefix 'Products' -AccountURL '$(System.CollectionUri)' -ProjectName '$(System.TeamProject)' -BuildID $(VisualStudio.BaseBuild.ID) -OutVariableName 'VisualStudio.BaseBuild.ProductsDropName'
-        - task: PowerShell@2
-          name: SetBaseProductsDropNameToTarget
-          displayName: Set 'VisualStudio.BaseBuild.ProductsDropName' to drop from target build
-          retryCountOnTaskFailure: 3
-          condition: eq(variables['VisualStudio.BaseBuild.ID'], '')
-          inputs:
-            targetType: 'inline'
-            script: |
-              $buildDrop = "${{parameters.baseBuildDrop}}" -split "/"
-              $dropName = "Products/DevDiv/VS/$($buildDrop[-2])/$($buildDrop[-1])"
-              Write-Host "##vso[task.setvariable variable=VisualStudio.BaseBuild.ProductsDropName]$dropName"
-
-##############################
-## preDeployAndRunTestsStepList
-##############################
-      preDeployAndRunTestsStepList:
-        - task: PowerShell@1
+      preDeployAndRunTestsOperations:
+        - operation: executePowerShellInline
           displayName: "Print Environment Variables"
-          inputs:
-            scriptType: "inlineScript"
-            inlineScript: |
-              Get-ChildItem Env: | Sort-Object Name | Format-Table -Wrap -AutoSize
+          scriptBlock: |
+            Get-ChildItem Env: | Sort-Object Name | Format-Table -Wrap -AutoSize
+          timeout: "0:0:5:0"
 
-        - task: DownloadPipelineArtifact@2
+        - operation: downloadAzureArtifactsDrop
           displayName: "Download scripts"
-          inputs:
-            artifactName: "scripts"
-            downloadPath: "$(Build.StagingDirectory)/scripts"
+          dropName: "$(RunSettingsDrop)"
+          destinationDirectory: "c:\\nuget\\RunSettings"
+          timeout: "0:0:10:0"
 
-        - task: PowerShell@1
+        - operation: executePowerShellScript
           displayName: "SetupFunctionalTests.ps1"
-          inputs:
-            scriptName: "$(Build.StagingDirectory)/scripts/e2etests/SetupFunctionalTests.ps1"
-
+          scriptPath: "c:\\nuget\\RunSettings\\scripts\\e2etests\\SetupFunctionalTests.ps1"
+          timeout: "0:0:10:0"
diff --git a/eng/pipelines/vs-test/build.yml b/eng/pipelines/vs-test/build.yml
@@ -167,6 +167,12 @@ steps:
       Contents: "NuGet.exe"
       TargetFolder: "$(Build.StagingDirectory)\\E2ETests"
 
+  - task: CopyFiles@2
+    displayName: "Copy scripts for cloudbuild machines"
+    inputs:
+      SourceFolder: "$(Build.Repository.LocalPath)\\scripts"
+      TargetFolder: "$(Build.StagingDirectory)\\RunSettings\\scripts"
+
   - task: NuGetToolInstaller@1
 
   - task: NuGetCommand@2
@@ -218,6 +224,10 @@ steps:
           Write-Host "Run Settings Drop: $runSettingsDrop"
           Write-Host "##vso[task.setvariable variable=RunSettingsDrop]$runSettingsDrop"
           Write-Host "##vso[task.setvariable variable=RunSettingsDrop;isOutput=true]$runSettingsDrop"
+
+          $vsBootstrapperBranch = dotnet msbuild -getProperty:VsTargetBranch build\config.props
+          Write-Host "VS Bootstrapper Branch: $vsBootstrapperBranch"
+          Write-Host "##vso[task.setvariable variable=VsBootstrapperBranch;isOutput=true]$vsBootstrapperBranch"
         } catch {
           Write-Host "##vso[task.LogIssue type=error;]Unable to set variables for DartLab: $_"
           exit 1
diff --git a/eng/pipelines/vs-tests.yml b/eng/pipelines/vs-tests.yml
@@ -40,12 +40,13 @@ parameters:
   - delete
   - stop
 - name: ApexAgentCleanup
-  displayName: Delete or keep VS Apex test machine for debugging
+  displayName: Cleanup VS Apex test machine
   type: string
-  default: delete
+  default: Always
   values:
-  - delete
-  - stop
+    - Always
+    - Never
+    - OnSuccess
 
 resources:
   pipelines:
@@ -134,19 +135,14 @@ stages:
     dependsOn:
     - Build
     variables:
-    - name: VsBootstrapperUrl
+    - name: bootstrapperUrl
       value: $[stageDependencies.Build.Build.outputs['dartlab_variables.bootstrapperUrl']]
-    - name: VsBaseBuildDrop
-      value: $[stageDependencies.Build.Build.outputs['dartlab_variables.BaseBuildDrop']]
-    - name: QBuildSessionId
-      value: $[stageDependencies.Build.Build.outputs['dartlab_variables.QBuildSessionId']]
     - name: RunSettingsDrop
       value: $[stageDependencies.Build.Build.outputs['dartlab_variables.RunSettingsDrop']]
-    baseBuildDrop: $(VsBaseBuildDrop)
-    bootstrapperUrl: $(VsBootstrapperUrl)
-    dartLabEnvironment: ${{parameters.DartLabEnvironment}}
-    isOfficialBuild: false
-    QBuildSessionId: $(QBuildSessionId)
+    - name: VsBootstrapperBranch
+      value: $[stageDependencies.Build.Build.outputs['dartlab_variables.VsBootstrapperBranch']]
+    bootstrapperUrl: $(bootstrapperUrl)
     runSettingsURI: https://vsdrop.corp.microsoft.com/file/v1/$(RunSettingsDrop);NuGet.Tests.Apex.runsettings
     testExecutionJobTimeoutInMinutes: 150
-    testMachineCleanUpStrategy: ${{parameters.ApexAgentCleanup}}
+    testDeploymentCleanupMode: ${{parameters.ApexAgentCleanup}}
+    VsBootstrapperBranch: $(VsBootstrapperBranch)
