Skip to content

Commit bd31be2

Browse files
liushilongbuaazbud-msft
authored andcommitted
[ci] Update reproducible build related pipeline. (sonic-net#11810)
1 parent eb08462 commit bd31be2

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

.azure-pipelines/azure-pipelines-repd-build-variables.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
22
${{ if eq(variables['Build.Reason'],'PullRequest') }}:
3-
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([ "$(System.PullRequest.TargetBranch)" != "master" ] && echo deb,py2,py3,web,git,docker)'
3+
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([[ "$(System.PullRequest.TargetBranch)" =~ ^20[2-9][0-9]{3}$ ]] && echo deb,py2,py3,web,git,docker)'
44
${{ elseif ne(variables['Build.SourceBranchName'],'master') }}:
55
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
66
${{ else }}:

.azure-pipelines/official-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ stages:
3838
variables:
3939
- name: CACHE_MODE
4040
value: wcache
41-
- template: azure-pipelines-repd-build-variables.yml
41+
- template: azure-pipelines-repd-build-variables.yml@buildimage
4242
jobs:
4343
- template: azure-pipelines-build.yml
4444
parameters:

azure-pipelines.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ resources:
3838

3939
variables:
4040
- template: .azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage
41-
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
42-
- template: .azure-pipelines/template-variables.yml
43-
- ${{ else }}:
44-
- template: .azure-pipelines/template-variables.yml@buildimage
41+
- template: .azure-pipelines/template-variables.yml@buildimage
4542
- name: CACHE_MODE
4643
value: rcache
4744
- name: ENABLE_FIPS

0 commit comments

Comments
 (0)