OptProf cleanup (#32900)

azure-pipelines-official.yml

@@ -20,7 +20,6 @@ jobs:
 
   variables:
     VisualStudio.MajorVersion: 16
-    VisualStudio.BranchName: 'lab/d16.0stg'
     VisualStudio.ChannelName: 'int.d16.0stg'
     VisualStudio.DropName: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
 
@@ -66,8 +65,7 @@ jobs:
               -officialBuildId $(Build.BuildNumber)
               -officialSkipTests $(SkipTests)
               -officialSkipApplyOptimizationData $(SkipApplyOptimizationData)
-              -vsDropName $(VisualStudio.DropName) 
-              -vsBranch $(VisualStudio.BranchName)
+              -vsDropName $(VisualStudio.DropName)
               -vsDropAccessToken $(System.AccessToken)
               /p:DotNetSignType=$(SignType)
               /p:DotNetPublishToBlobFeed=true
@@ -128,15 +126,6 @@ jobs:
     displayName: 'OptProf - Publish Artifact: MicroBuildOutputs'
     condition: succeeded()
 
-  # Publish scripts to get the branch of VS that this inserts into
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\BranchInfo'
-      ArtifactName: BranchInfo
-      ArtifactType: Container
-    displayName: 'OptProf - Publish Artifact: BranchInfo'
-    condition: succeeded()
-
   - task: PublishBuildArtifacts@1
     displayName: Publish Logs
     inputs:
@@ -199,6 +188,13 @@ jobs:
       ArtifactName: AssetManifests
     condition: succeeded()
 
+  # Tag the build at the very end when we know it's been successful.
+  - task: colinsalmcorner.colinsalmcorner-buildtasks.tag-build-task.tagBuildOrRelease@0
+    displayName: Tag build as ready for optimization training
+    inputs:
+      tags: 'ready-for-training'
+    condition: succeeded()
+
   - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
     displayName: Perform Cleanup Tasks
     condition: succeededOrFailed()

eng/build.ps1

@@ -47,7 +47,6 @@ param (
     [string]$officialSkipApplyOptimizationData = "",
     [string]$officialSkipTests = "",
     [string]$vsDropName = "",
-    [string]$vsBranch = "",
     [string]$vsDropAccessToken = "",
 
     # Test actions
@@ -104,7 +103,6 @@ function Print-Usage() {
     Write-Host "  -officialSkipTests <bool>                   Pass 'true' to not run tests"
     Write-Host "  -officialSkipApplyOptimizationData <bool>   Pass 'true' to not apply optimization data"
     Write-Host "  -vsDropName                                 Visual Studio product drop name"
-    Write-Host "  -vsBranch                                   Visual Studio insertion branch"
     Write-Host "  -vsDropAccessToken                          Visual Studio drop access token"
     Write-Host ""
     Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild."
@@ -137,7 +135,6 @@ function Process-Arguments() {
        exit 0
     }
 
-    OfficialBuildOnly "vsBranch"
     OfficialBuildOnly "vsDropName"
     OfficialBuildOnly "vsDropAccessToken"
     OfficialBuildOnly "officialSkipTests"
@@ -149,7 +146,6 @@ function Process-Arguments() {
         $script:applyOptimizationData = ![System.Boolean]::Parse($officialSkipApplyOptimizationData)
         $script:buildOptimizationData = $true
     } else {
-        $script:vsBranch = "dummy/ci"
         $script:vsDropName = "Products/DummyDrop"
         $script:applyOptimizationData = $script:buildOptimizationData = $ci -and $configuration -eq "Release" -and $msbuildEngine -eq "vs"
     }
@@ -299,9 +295,7 @@ function Restore-OptProfData() {
 
 function Build-OptProfData() {
     $insertionDir = Join-Path $VSSetupDir "Insertion"
-    $optProfDir = Join-Path $ArtifactsDir "OptProf\$configuration"
-    $optProfDataDir = Join-Path $optProfDir "Data"
-    $optProfBranchDir = Join-Path $optProfDir "BranchInfo"
+    $optProfDataDir = Join-Path $ArtifactsDir "OptProf\$configuration\Data"
 
     $optProfConfigFile = Join-Path $EngRoot "config\OptProf.json"
     $optProfToolDir = Get-PackageDir "RoslynTools.OptProf"
@@ -310,11 +304,6 @@ function Build-OptProfData() {
     Write-Host "Generating optimization data using '$optProfConfigFile' into '$optProfDataDir'"
     Exec-Console $optProfToolExe "--configFile $optProfConfigFile --insertionFolder $insertionDir --outputFolder $optProfDataDir"
 
-    # Write out branch we are inserting into
-    Create-Directory $optProfBranchDir
-    $vsBranchFile = Join-Path $optProfBranchDir "vsbranch.txt"
-    $vsBranch >> $vsBranchFile
-
     # Set VSO variables used by MicroBuildBuildVSBootstrapper pipeline task
     $manifestList = [string]::Join(',', (Get-ChildItem "$insertionDir\*.vsman"))
 

eng/generate-optprof-run-settings.ps1

@@ -14,7 +14,7 @@ try {
   $optProfToolDir = Get-PackageDir "Roslyn.OptProf.RunSettings.Generator"
   $optProfToolExe = Join-Path $optProfToolDir "tools\roslyn.optprof.runsettings.generator.exe"
   $configFile = Join-Path $EngRoot "config\OptProf.json"
-  $runSettingsFile = Join-Path $VSSetupDir "Insertion\RunSettings\RoslynOptProf.runsettings"
+  $runSettingsFile = Join-Path $VSSetupDir "Insertion\OptProf\Training.runsettings"
 
   Exec-Console $optProfToolExe "--config $configFile --vsDropName $vsDropName --bootstrapperInfo $bootstrapperInfo --out $runSettingsFile"