Merge pull request #2528 from microsoft/dev/lucygramley/updateInsertionPipeline

lucygramley · web-flow · commit 9a9fe3027802 · 2025-10-20T15:41:02.000-07:00
Updated insertion pipeline to satisfy new reqs
diff --git a/azure-pipelines/build-insertion.yml b/azure-pipelines/build-insertion.yml
@@ -1 +1,95 @@
-#empty yaml for testing insertion pipeline
+trigger: none # We only want to trigger manually or based on resources
+pr: none
+
+resources:
+  repositories:
+  - repository: MicroBuildTemplate
+    type: git
+    name: 1ESPipelineTemplates/MicroBuildTemplate
+    ref: refs/tags/release
+  pipelines:
+  - pipeline: projectSystemBuild
+    source: NTVS main - nodejstools
+    tags:
+      - Real signed
+    trigger: none
+
+variables:
+  ContainsVsix: true
+
+extends:
+  template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
+  parameters:
+    sdl:
+      sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
+    stages:
+    - stage: insertion
+      jobs:
+      - job: insertion
+        displayName: VS insertion
+        pool: VSEngSS-MicroBuild2022-1ES
+        templateContext:
+          outputParentDirectory: $(Pipeline.Workspace)
+          sdl:
+            binskim:
+              analyzeTargetGlob: +:f|$(Pipeline.Workspace)/**;
+        steps:
+        - checkout: self
+        - download: projectSystemBuild
+          artifact: Variables-Windows
+          displayName: 🔻 Download Variables-Windows artifact
+        - powershell: $(Pipeline.Workspace)/projectSystemBuild/Variables-Windows/_define.ps1
+          displayName: ⚙︝ Set pipeline variables based on artifacts
+        - powershell: Write-Host "##vso[build.updatebuildnumber]$(Build.BuildNumber)"
+          displayName: ⚙️ Set pipeline name
+        - template: /azure-pipelines/release-deployment-prep.yml@self
+        - powershell: |
+            $testsDropName = '$(VstsDropNames)' -replace 'Products', 'Tests'
+            Write-Host "##vso[task.setvariable variable=TESTSDROPNAME]$testsDropName"
+          displayName: ⚙ Set test drop name
+        - download: projectSystemBuild
+          artifact: vsix
+          displayName: 🔻 Download vsix artifact
+        - ${{ if eq(variables['ContainsVsix'], 'true') }}:
+          - task: 1ES.MicroBuildVstsDrop@1
+            displayName: 🔺 Upload VSTS Drop
+            inputs:
+              dropFolder: $(Pipeline.Workspace)/projectSystemBuild/vsix
+              dropName: $(VstsDropNames)
+              accessToken: $(System.AccessToken)
+              skipUploadIfExists: true
+        - task: MicroBuildInsertVsPayload@5
+          displayName: 🏭 Insert VS Payload
+          inputs:
+            TeamName: Node Tools for Visual Studio
+            TeamEmail: jojteam@microsoft.com
+            InsertionPayloadName: Node Tools for Visual Studio build
+            InsertionReviewers: '$(Build.RequestedFor);JSTSteam;JSTS CTI'
+            CustomScriptExecutionCommand: '$(Build.SourcesDirectory)/tools/empty-powershell.ps1' #This is intentionally an empty powershell run because MicroBuild needs a CustomScriptExecutionCommand but we don't actually need it
+            AutoCompletePR: true
+            AutoCompleteMergeStrategy: Squash
+            ShallowClone: true
+            InsertAutoComplete: true
+        - download: projectSystemBuild
+          artifact: symbolsToArchive
+          displayName: 🔻 Download symbolsToArchive artifact
+        - task: MicroBuildArchiveSymbols@6
+          displayName: 🔣 Archive symbols to Symweb
+          inputs:
+            TeamName: Node Tools for Visual Studio
+            azureSubscription: 'VSEng-SymbolsUpload'     # SERVICE CONNECTION
+            SymbolsFeatureName: NTVS
+            SymbolsProject: VS
+            SymbolsAgentPath: $(Pipeline.Workspace)/projectSystemBuild/symbolsToArchive #$(System.DefaultWorkingDirectory)\NTVS v3\Symbols    link: https://dev.azure.com/devdiv/DevDiv/_releaseDefinition?definitionId=300&_a=definition-variables
+          env:
+            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+        - powershell: |
+            $contentType = 'application/json';
+            $headers = @{ Authorization = 'Bearer $(System.AccessToken)' };
+            $rawRequest = @{ daysValid = 365 * 2; definitionId = $(System.DefinitionId); ownerId = 'User:$(Build.RequestedForId)'; protectPipeline = $false; runId = $(Build.BuildId) };
+            $request = ConvertTo-Json @($rawRequest);
+            Write-Host $request
+            $uri = "$(System.CollectionUri)$(System.TeamProject)/_apis/build/retention/leases?api-version=6.0-preview.1";
+            Invoke-RestMethod -uri $uri -method POST -Headers $headers -ContentType $contentType -Body $request;
+          displayName: 🗻 Retain inserted builds
diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
@@ -78,7 +78,17 @@ extends:
           - output: pipelineArtifact
             displayName: 'Publish Symbols Artifact'
             targetPath: $(Build.ArtifactStagingDirectory)\symbols
-            artifactName: Symbols
+            artifactName: symbolsToArchive
+          
+          - output: pipelineArtifact
+            displayName: 'Publish Artifact: vsix'
+            targetPath: $(Build.ArtifactStagingDirectory)\vsix
+            artifactName: vsix
+          
+          - output: pipelineArtifact
+            displayName: 'Publish Artifact: Variables-Windows'
+            targetPath: $(Build.SourcesDirectory)/azure-pipelines/variables
+            artifactName: Variables-Windows
           
           - output: microBuildVstsDrop
             displayName: Upload VSTS Drop
@@ -202,6 +212,30 @@ extends:
             SourceFolder: $(Build.ArtifactStagingDirectory)\sbom
             Contents: _manifest\**\*.json
             TargetFolder: '$(Build.ArtifactStagingDirectory)\raw'
+        
+        - task: CopyFiles@2
+          displayName: Copy tools folder for symbols-legacy
+          inputs:
+            SourceFolder: tools
+            TargetFolder: $(Build.ArtifactStagingDirectory)\tools
+        
+        - task: CopyFiles@2
+          displayName: Copy VSIX to staging directory
+          inputs:
+            SourceFolder: '$(System.DefaultWorkingDirectory)'
+            Contents: '**\*.vsix'
+            TargetFolder: '$(Build.ArtifactStagingDirectory)\vsix'
+            flattenFolders: true
+
+        #Variables
+        - template: azure-pipelines/release-deployment-prep.yml@self
+
+        - task: CopyFiles@2
+          displayName: Copy Variables-Windows files
+          inputs:
+            SourceFolder: $(Build.SourcesDirectory)/azure-pipelines/variables
+            TargetFolder: $(Build.ArtifactStagingDirectory)/$(VSTSDROPNAMES)/azure-pipelines/variables
+
 
         - task: PublishSymbols@2
           displayName: Index Sources and Publish Symbols
diff --git a/azure-pipelines/release-deployment-prep.yml b/azure-pipelines/release-deployment-prep.yml
@@ -0,0 +1,3 @@
+steps:
+- powershell: azure-pipelines/variables/_define.ps1
+  displayName: ⚙️ Set pipeline variables based on artifacts
diff --git a/azure-pipelines/variables/BusinessGroupName.ps1 b/azure-pipelines/variables/BusinessGroupName.ps1
@@ -0,0 +1 @@
+'Visual Studio - VS Core'
diff --git a/azure-pipelines/variables/DropRoot.ps1 b/azure-pipelines/variables/DropRoot.ps1
@@ -0,0 +1 @@
+'\\cpvsbuild\drops\nodejstools\build'
diff --git a/azure-pipelines/variables/InsertAutoComplete.ps1 b/azure-pipelines/variables/InsertAutoComplete.ps1
@@ -0,0 +1 @@
+'true'
diff --git a/azure-pipelines/variables/InsertBuildPolicy.ps1 b/azure-pipelines/variables/InsertBuildPolicy.ps1
@@ -0,0 +1 @@
+'Request Perf DDRITs'
diff --git a/azure-pipelines/variables/InsertJsonValues.ps1 b/azure-pipelines/variables/InsertJsonValues.ps1
@@ -0,0 +1,17 @@
+$vstsDropNames = & "$PSScriptRoot\VstsDropNames.ps1"
+
+# $BasePath = "$PSScriptRoot\..\..\Nodejs\Setup\NodejsTools.vsmanproj"
+$BasePath = "$PSScriptRoot\..\..\BuildOutput\Release\Setup" #this seemed to work?
+
+if (Test-Path $BasePath) {
+    $vsmanFiles = @()
+    Get-ChildItem $BasePath *.vsman -Recurse -File |% {
+        $version = (Get-Content $_.FullName | ConvertFrom-Json).info.buildVersion
+        $fn = $_.Name
+        $vsmanFiles += "$fn=https://vsdrop.corp.microsoft.com/file/v1/$vstsDropNames;$fn"
+        # $vsmanFiles += "NodeJsTools.vsman=https://vsdrop.corp.microsoft.com/file/v1/$vstsDropNames;$fn"
+                        #NodejsTools.vsman=https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/nodejstools/$(Build.SourceBranchName)/$(Build.BuildNumber);NodejsTools.vsman
+    }
+
+    [string]::join(',',$vsmanFiles)
+}
diff --git a/azure-pipelines/variables/InsertReviewers.ps1 b/azure-pipelines/variables/InsertReviewers.ps1
@@ -0,0 +1 @@
+'JSTSteam, JSTS CTI'
diff --git a/azure-pipelines/variables/InsertTargetBranch.ps1 b/azure-pipelines/variables/InsertTargetBranch.ps1
@@ -0,0 +1,2 @@
+# This is the default branch of the VS repo that we will use to insert into VS.
+'main'
diff --git a/azure-pipelines/variables/LocLanguages.ps1 b/azure-pipelines/variables/LocLanguages.ps1
@@ -0,0 +1,6 @@
+## For faster PR/CI builds localize only for 2 languages, ENU and JPN provide good enough coverage
+if ($env:BUILD_REASON -eq 'PullRequest') {
+  'ENU,JPN'
+} else {
+  'VS'
+}
diff --git a/azure-pipelines/variables/ProfilingInputsDropName.ps1 b/azure-pipelines/variables/ProfilingInputsDropName.ps1
@@ -0,0 +1,5 @@
+if ($env:SYSTEM_TEAMPROJECT) {
+    "ProfilingInputs/$env:SYSTEM_TEAMPROJECT/$env:BUILD_REPOSITORY_NAME/$env:BUILD_SOURCEBRANCHNAME/$env:BUILD_BUILDID"
+} else {
+    Write-Warning "No Azure Pipelines build detected. No Azure Pipelines drop name will be computed."
+}
diff --git a/azure-pipelines/variables/SymbolsFeatureName.ps1 b/azure-pipelines/variables/SymbolsFeatureName.ps1
@@ -0,0 +1 @@
+'NTVS'
diff --git a/azure-pipelines/variables/TeamName.ps1 b/azure-pipelines/variables/TeamName.ps1
@@ -0,0 +1 @@
+'Node Tools for Visual Studio'
diff --git a/azure-pipelines/variables/VstsDropNames.ps1 b/azure-pipelines/variables/VstsDropNames.ps1
@@ -0,0 +1 @@
+"Products/$env:SYSTEM_TEAMPROJECT/microsoft/nodejstools/$env:BUILD_SOURCEBRANCHNAME/$env:BUILD_BUILDNUMBER"
diff --git a/azure-pipelines/variables/_all.ps1 b/azure-pipelines/variables/_all.ps1
@@ -0,0 +1,20 @@
+#!/usr/bin/env pwsh
+
+<#
+.SYNOPSIS
+    This script returns a hashtable of build variables that should be set
+    at the start of a build or release definition's execution.
+#>
+
+[CmdletBinding(SupportsShouldProcess = $true)]
+param (
+)
+
+$vars = @{}
+
+Get-ChildItem "$PSScriptRoot\*.ps1" -Exclude "_*" |% {
+    Write-Host "Computing $($_.BaseName) variable"
+    $vars[$_.BaseName] = & $_
+}
+
+$vars
diff --git a/azure-pipelines/variables/_define.ps1 b/azure-pipelines/variables/_define.ps1
@@ -0,0 +1,45 @@
+<#
+.SYNOPSIS
+    This script translates the variables returned by the _all.ps1 script
+    into commands that instruct Azure Pipelines to actually set those variables for other pipeline tasks to consume.
+
+    The build or release definition may have set these variables to override
+    what the build would do. So only set them if they have not already been set.
+#>
+
+[CmdletBinding()]
+param (
+)
+
+Write-Host "Outputting variables to: $PSScriptRoot" -ForegroundColor Green
+
+(& "$PSScriptRoot\_all.ps1").GetEnumerator() |% {
+    # Always use ALL CAPS for env var names since Azure Pipelines converts variable names to all caps and on non-Windows OS, env vars are case sensitive.
+    $keyCaps = $_.Key.ToUpper()
+    if ((Test-Path "env:$keyCaps") -and (Get-Content "env:$keyCaps")) {
+        Write-Host "Skipping setting $keyCaps because variable is already set to '$(Get-Content env:$keyCaps)'." -ForegroundColor Cyan
+    } else {
+        Write-Host "$keyCaps=$($_.Value)" -ForegroundColor Yellow
+        if ($env:TF_BUILD) {
+            Write-Host "in env: TF_BUILD case"
+            # Create two variables: the first that can be used by its simple name and accessible only within this job.
+            Write-Host "##vso[task.setvariable variable=$keyCaps]$($_.Value)"
+            # and the second that works across jobs and stages but must be fully qualified when referenced.
+            Write-Host "##vso[task.setvariable variable=$keyCaps;isOutput=true]$($_.Value)"
+        } elseif ($env:GITHUB_ACTIONS) {
+            Write-Host "in env: GITHUB_ACTIONS case"
+            Add-Content -LiteralPath $env:GITHUB_ENV -Value "$keyCaps=$($_.Value)"
+        }
+        Set-Item -LiteralPath "env:$keyCaps" -Value $_.Value
+        
+        $filePath = Join-Path $PSScriptRoot "$($_.Key).ps1"
+        $temp = $_.Value
+        $temp = "'$($temp)'"
+        Set-Content -Path $filePath -Value $temp #this no longer updates vstsdrop names
+        Write-Host "Writing to file: $filePath" -ForegroundColor Magenta
+        Write-Host "  Content: $($_.Value)" -ForegroundColor Magenta
+
+        Write-Host "Keycaps: $keyCaps"
+        Write-Host "Value: $($_.Value)"
+    }
+}
diff --git a/tools/empty-powershell.ps1 b/tools/empty-powershell.ps1
@@ -0,0 +1 @@
+''

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+steps:`
	`2`	`+- powershell: azure-pipelines/variables/_define.ps1`
	`3`	`+ displayName: ⚙️ Set pipeline variables based on artifacts`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# This is the default branch of the VS repo that we will use to insert into VS.`
	`2`	`+'main'`