Update Images used for release (PowerShell#16580)

# Conflicts: # tools/releaseBuild/azureDevOps/releasePipeline.yml # tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml # tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml # tools/releaseBuild/azureDevOps/templates/testartifacts.yml # tools/releaseBuild/azureDevOps/vpackRelease.yml
daxian-dbw · Mar 11, 2022 · a1a3fb7 · a1a3fb7
1 parent 5616c42
commit a1a3fb7
Show file tree

Hide file tree

Showing 21 changed files with 95 additions and 58 deletions.
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -177,7 +177,7 @@ stages:
         pool:
           name: PowerShell1ES
           demands:
-          - ImageOverride -equals MMS2019
+          - ImageOverride -equals MMS2019TLS
         steps:
         - checkout: self
           clean: true

diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -79,6 +79,7 @@ stages:
   - job: ValidatePkgNames
     displayName: Validate Package Names
     pool:
+      # testing
       vmImage: windows-latest
     variables:
     - group: 'Azure Blob variable group'
@@ -87,6 +88,7 @@ stages:
   - job: ValidatePkgBOM
     displayName: Validate Package BOM
     pool:
+      # testing
       vmImage: windows-latest
     variables:
     - group: 'Azure Blob variable group'
@@ -140,8 +142,11 @@ stages:
   jobs:
   - deployment: AzureBlobPublic
     displayName: Make Azure Blob Public
-    pool:
-      vmImage: windows-latest
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
     variables:
     - group: 'Staging_ACR'
     environment: PSReleaseAzureBlobPublic
@@ -153,8 +158,11 @@ stages:
 
   - job: GitHubDraft
     displayName: Create GitHub Draft release
-    pool:
-      vmImage: windows-latest
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
     variables:
     - group: 'Azure Blob variable group'
     - group: 'AzDevOpsArtifacts'
@@ -186,14 +194,20 @@ stages:
   dependsOn: GitHubManualTasks
   jobs:
   - job: PublishNuget
-    pool:
-      vmImage: windows-latest
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
     steps:
     - template: templates/release-ReleaseToNuGet.yml
 
   - job: PublishPkgsMsftCom
-    pool:
-      vmImage: ubuntu-latest
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMSUbuntu20.04TLS
+
     variables:
     - group: 'AzDevOpsArtifacts'
     - group: 'packages.microsoft.com'
@@ -262,8 +276,12 @@ stages:
   displayName: Upload BuildInfoJson
   jobs:
   - job: UploadJson
-    pool:
-      vmImage: windows-latest
+    displayName: Upload BuildInfoJson
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
     variables:
     - group: 'Azure Blob variable group'
     steps:

diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   steps:
   - checkout: self
     clean: true

diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -18,7 +18,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   # APIScan can take a long time
   timeoutInMinutes: 180

diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
@@ -19,7 +19,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   # APIScan can take a long time
   timeoutInMinutes: 180

diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   timeoutInMinutes: 15
 

diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
@@ -15,7 +15,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   steps:
   #- task: <task type name>@<version>

diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMSUbuntu20.04
+    - ImageOverride -equals MMSUbuntu20.04TLS
   dependsOn: ${{ parameters.parentJob }}
   variables:
     - name: runCodesignValidationInjection
@@ -149,7 +149,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - name: buildName
       value: ${{ parameters.buildName }}

diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -9,7 +9,7 @@ jobs:
     pool:
       name: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019
+      - ImageOverride -equals MMS2019TLS
 
     variables:
       - group: ESRP

diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -9,7 +9,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - group: ESRP
     - name: runCodesignValidationInjection

diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   timeoutInMinutes: 90
 

diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -10,6 +10,7 @@ jobs:
 - job: ${{ parameters.jobName }}
   displayName: ${{ parameters.displayName }}
   pool:
+    # test
     vmImage: ${{ parameters.imageName }}
   steps:
     - checkout: self

diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -7,6 +7,7 @@ jobs:
 - job: ${{ parameters.jobName }}
   displayName: ${{ parameters.displayName }}
   pool:
+    # testing
     vmImage: ${{ parameters.imageName }}
   steps:
     - checkout: self

diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
@@ -1,8 +1,11 @@
 jobs:
 - job: UpdateDepsFiles
   displayName: Update deps files
-  pool:
-    vmImage: windows-latest
+
+  pool: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019TLS
+
   variables:
   - group: 'Azure Blob variable group'
   steps:

diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -7,12 +7,13 @@ jobs:
       value: none
   displayName: Build test artifacts
   condition: succeeded()
-  pool: 'Hosted Ubuntu 1604'
+  pool:
+    # testing
+    vmImage: ubuntu-latest
   steps:
   - checkout: self
     clean: true
 
-
   - pwsh: |
       Import-Module ./build.psm1
       Start-PSBootstrap

diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -6,6 +6,8 @@ jobs:
   displayName: Build and Publish VPack - ${{ parameters.architecture }}
   condition: succeeded()
   pool: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019TLS
   steps:
   - checkout: self
     clean: true

diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
@@ -12,7 +12,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   steps:
   - checkout: self

diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - name: runCodesignValidationInjection
       value: false

diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
       value: 1

diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - name: BuildConfiguration
       value: ${{ parameters.BuildConfiguration }}

diff --git a/tools/releaseBuild/azureDevOps/vpackRelease.yml b/tools/releaseBuild/azureDevOps/vpackRelease.yml
@@ -17,36 +17,47 @@ variables:
     value: 1
   - group: Azure Blob variable group
 
-jobs:
-- job: rename
-  displayName: Name the build
-  condition: succeeded()
-  pool:
-    vmImage: 'windows-latest'
-  steps:
-  - checkout: self
-    clean: true
-
-  - template: ./templates/SetVersionVariables.yml
+stages:
+- stage: prep
+  displayName: Create buildInfo and name the Pipeline
+  jobs:
+  - job: rename
+    displayName: Name the build
+    condition: succeeded()
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
+    steps:
+    - checkout: self
+      clean: true
+
+    - template: ./templates/SetVersionVariables.yml
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+        CreateJson: yes
+        UseJson: no
+
+    - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
+      displayName: Set Build Name for Non-PR
+      condition: ne(variables['Build.Reason'], 'PullRequest')
+
+- stage: release
+  displayName: Release
+  jobs:
+  - template: ./templates/vpackReleaseJob.yml
     parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
+      architecture: x64
 
-  - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
-    displayName: Set Build Name for Non-PR
-    condition: ne(variables['Build.Reason'], 'PullRequest')
-
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: x64
-
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: x86
+  - template: ./templates/vpackReleaseJob.yml
+    parameters:
+      architecture: x86
 
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: arm32
+  - template: ./templates/vpackReleaseJob.yml
+    parameters:
+      architecture: arm32
 
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: arm64
+  - template: ./templates/vpackReleaseJob.yml
+    parameters:
+      architecture: arm64