Skip to content

Commit 7c9a598

Browse files
committed
Update pipelines from Dev17 to Dev18
- Change FileVersionPrefix from 17.0 to 18.0 - Switch variable group from PTVS-Dev17 to PTVS-Dev18 - Switch pool from VSEngSS-MicroBuild2022-1ES to VSEng-MicroBuildVSStable - Update VisualStudio demand from 17.0 to 18.0 - Update integration tests pipeline source from PTVS-Build-Dev17 to PTVS-Build-Dev18 - Move VS bootstrapper step outside Non-PR conditional - Re-enable glass tests for PR builds
1 parent 1272ca1 commit 7c9a598

File tree

5 files changed

+21
-23
lines changed

5 files changed

+21
-23
lines changed

azure-pipelines-compliance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535

3636
# The agent pool the build will run on
3737
pool:
38-
name: VSEngSS-MicroBuild2022-1ES
38+
name: VSEng-MicroBuildVSStable
3939
demands:
4040
- msbuild
41-
- VisualStudio_17.0
41+
- VisualStudio_18.0
4242

4343
# Job variables
4444
variables:
@@ -47,7 +47,7 @@ jobs:
4747

4848
# PTVS variable group
4949
# This contains variables shared between various PTVS pipelines
50-
- group: PTVS-Dev17
50+
- group: PTVS-Dev18
5151

5252
steps:
5353

azure-pipelines-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ resources:
1010
# All PTVS build artifacts come from this pipeline and are referenced like this:
1111
# $(Pipeline.Workspace)\ComponentBuildUnderTest\<artifactName>\<filePath>
1212
- pipeline: ComponentBuildUnderTest
13-
source: PTVS-Build-Dev17
13+
source: PTVS-Build-Dev18
1414
branch: main # This is only used for manual/scheduled runs of this pipeline
1515
trigger:
1616
branches:

azure-pipelines-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variables:
2828
value: ${{ parameters.PublishNugetPackage }}
2929

3030
# https://devdiv.visualstudio.com/DevDiv/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=604&path=PTVS-Dev18
31-
- group: PTVS-Dev17
31+
- group: PTVS-Dev18
3232

3333
resources:
3434
repositories:
@@ -61,7 +61,7 @@ extends:
6161
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
6262
parameters:
6363
pool:
64-
name: VSEngSS-MicroBuild2022-1ES
64+
name: VSEng-MicroBuildVSStable
6565
os: windows
6666
stages:
6767
- stage: Release

azure-pipelines.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ variables:
8686
- name: DropRoot
8787
value: \\cpvsbuild\Drops\DSTools\PTVS\$(Build.SourceBranchName)\$(Build.BuildNumber)\
8888
- name: FileVersionPrefix
89-
value: 17.0
89+
value: 18.0
9090
- name: IncludeDjangoHtmlExtensions
9191
value: true
9292
- name: IncludeMiniconda
@@ -119,7 +119,7 @@ variables:
119119
value: ${{ parameters.ptvsPackageVersion }}
120120

121121
# Import variables from PTVS-Dev18 variable group
122-
- group: PTVS-Dev17
122+
- group: PTVS-Dev18
123123

124124
# The `resources` specify the location and version of the 1ES PT.
125125
# The ref of the repository is set to release tag which is intended to be used by most pipelines.
@@ -137,7 +137,7 @@ extends:
137137
# specify the image type. Here are the allowed values: windows, linux, or macOS. The default value is windows.
138138
# Hence, this property must be specified for linux and macOS.
139139
pool:
140-
name: VSEngSS-MicroBuild2022-1ES
140+
name: VSEng-MicroBuildVSStable
141141
os: windows
142142
featureFlags:
143143
# Consolidate SDL pre-check tasks into a single step to reduce pipeline overhead
@@ -234,12 +234,12 @@ extends:
234234
parameters:
235235
ptvsPackageVersion: ${{ variables.ptvsPackageVersionVar }}
236236

237+
# Create VS bootstrapper for testing
238+
- template: Build/templates/create_vs_bootstrapper.yml@self
239+
237240
# Non-PR steps
238241
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
239242

240-
# Create VS bootstrapper for testing
241-
- template: Build/templates/create_vs_bootstrapper.yml@self
242-
243243
# Upload vsts drop used by Visual Studio insertions
244244
# For more info, see https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs/microbuild-vsts-drop
245245
- task: 1ES.MicroBuildVstsDrop@1
@@ -268,14 +268,12 @@ extends:
268268
- template: /Build/templates/publish_test_data.yml@self
269269

270270
# Run tests on mixed mode debugger but only for PR builds
271-
# - ${{ if or(eq(variables['Build.Reason'], 'PullRequest'), eq(variables['SkipGlassCache'], true)) }}:
272-
# - job: test
273-
# displayName: Test
274-
# steps:
275-
# - template: /Build/templates/run_tests.yml@self
276-
# parameters:
277-
# skipGlassCache: ${{ parameters.skipGlassCache }}
278-
279-
271+
- ${{ if or(eq(variables['Build.Reason'], 'PullRequest'), eq(variables['SkipGlassCache'], true)) }}:
272+
- job: test
273+
displayName: Test
274+
steps:
275+
- template: /Build/templates/run_tests.yml@self
276+
parameters:
277+
skipGlassCache: ${{ parameters.skipGlassCache }}
280278

281279

test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ pr:
1313
none
1414

1515
pool:
16-
name: VSEngSS-MicroBuild2022-1ES
16+
name: VSEng-MicroBuildVSStable
1717
demands:
1818
- msbuild
19-
- VisualStudio_17.0
19+
- VisualStudio_18.0
2020

2121
variables:
2222
ORGANIZATION: 'DevDiv'

0 commit comments

Comments
 (0)