Skip to content

Commit 25db351

Browse files
Switch from testpipeline variable to parameters (Azure#11986)
1 parent 2a6d439 commit 25db351

File tree

4 files changed

+29
-20
lines changed

4 files changed

+29
-20
lines changed

eng/pipelines/templates/stages/archetype-js-release.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ stages:
2929
deploy:
3030
steps:
3131
- checkout: self
32-
- task: PowerShell@2
33-
displayName: Prep template pipeline for release
34-
condition: and(succeeded(),eq(variables['TestPipeline'],'true'))
35-
inputs:
36-
pwsh: true
37-
workingDirectory: $(Build.SourcesDirectory)
38-
filePath: eng/scripts/SetTestPipelineVersion.ps1
32+
- ${{if eq(parameters.TestPipeline, 'true')}}:
33+
- task: PowerShell@2
34+
displayName: Prep template pipeline for release
35+
condition: succeeded()
36+
inputs:
37+
pwsh: true
38+
workingDirectory: $(Build.SourcesDirectory)
39+
filePath: eng/scripts/SetTestPipelineVersion.ps1
3940
- template: /eng/common/pipelines/templates/steps/verify-changelog.yml
4041
parameters:
4142
PackageName: ${{artifact.name}}
@@ -131,6 +132,7 @@ stages:
131132
DocRepoDestinationPath: 'docs-ref-services/'
132133
GHReviewersVariable: 'OwningGHUser'
133134
CIConfigs: $(CIConfigs)
135+
CloseAfterOpenForTesting: '${{ parameters.TestPipeline }}'
134136

135137
- ${{if ne(artifact.skipPublishDocGithubIo, 'true')}}:
136138
- deployment: PublishDocsGitHubIO
@@ -205,6 +207,7 @@ stages:
205207
PRBranchName: increment-package-version-${{ parameters.ServiceDirectory }}-$(Build.BuildId)
206208
CommitMsg: "Increment package version after release of ${{ artifact.name }}"
207209
PRTitle: "Increment version for ${{ parameters.ServiceDirectory }} releases"
210+
CloseAfterOpenForTesting: '${{ parameters.TestPipeline }}'
208211

209212
- stage: Integration
210213
dependsOn: ${{parameters.DependsOn}}

eng/pipelines/templates/stages/archetype-sdk-client.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ parameters:
22
- name: Artifacts
33
type: object
44
default: []
5+
- name: TestPipeline
6+
type: boolean
7+
default: false
58
- name: ServiceDirectory
69
type: string
710
default: not-specified
@@ -23,17 +26,19 @@ stages:
2326
jobs:
2427
- template: ../jobs/archetype-sdk-client.yml
2528
parameters:
26-
ServiceDirectory: ${{parameters.ServiceDirectory}}
27-
Artifacts: ${{parameters.Artifacts}}
28-
RunUnitTests: ${{parameters.RunUnitTests}}
29+
ServiceDirectory: ${{ parameters.ServiceDirectory }}
30+
Artifacts: ${{ parameters.Artifacts }}
31+
TestPipeline: ${{ parameters.TestPipeline }}
32+
RunUnitTests: ${{ parameters.RunUnitTests }}
2933

3034
# The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
3135
- ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'), eq(parameters.IncludeRelease,true))}}:
3236
- template: archetype-js-release.yml
3337
parameters:
3438
DependsOn: Build
35-
ServiceDirectory: ${{parameters.ServiceDirectory}}
36-
Artifacts: ${{parameters.Artifacts}}
39+
ServiceDirectory: ${{ parameters.ServiceDirectory }}
40+
Artifacts: ${{ parameters.Artifacts }}
41+
TestPipeline: ${{ parameters.TestPipeline }}
3742
ArtifactName: packages
3843
TargetDocRepoOwner: ${{ parameters.TargetDocRepoOwner }}
3944
TargetDocRepoName: ${{ parameters.TargetDocRepoName }}

eng/pipelines/templates/steps/build.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ parameters:
33
ServiceDirectory: not-specified
44

55
steps:
6-
- task: PowerShell@2
7-
displayName: Prep template pipeline for release
8-
condition: and(succeeded(),eq(variables['TestPipeline'],'true'))
9-
inputs:
10-
pwsh: true
11-
workingDirectory: $(Build.SourcesDirectory)
12-
filePath: eng/scripts/SetTestPipelineVersion.ps1
6+
- ${{if eq(parameters.TestPipeline, 'true')}}:
7+
- task: PowerShell@2
8+
displayName: Prep template pipeline for release
9+
condition: succeeded()
10+
inputs:
11+
pwsh: true
12+
workingDirectory: $(Build.SourcesDirectory)
13+
filePath: eng/scripts/SetTestPipelineVersion.ps1
1314

1415
- pwsh: |
1516
$folder = "${{parameters.ServiceDirectory}}"

sdk/template/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ trigger:
99
paths:
1010
include:
1111
- sdk/template/
12-
- eng/common/
1312

1413
pr:
1514
branches:
@@ -26,6 +25,7 @@ extends:
2625
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
2726
parameters:
2827
ServiceDirectory: template
28+
TestPipeline: true
2929
Artifacts:
3030
- name: azure-template
3131
safeName: azuretemplate

0 commit comments

Comments
 (0)