Skip to content

Commit 7fd5bf9

Browse files
jpayne3506jpayne3506
committed
test: change condition to matrix level
1 parent 655d5cf commit 7fd5bf9

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

‎.pipelines/build/images.jobs.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ jobs:
77
- ${{ each job_data in parameters.images }}:
88
- job: pkg_${{ job_data.job }}
99
displayName: "Prepare Image Package - ${{ job_data.displayName }} -"
10-
# If archiveVersion is empty then the respective component does not exist in that release train
11-
condition: and(succeeded(), ne(variables['archiveVersion'], ''))
1210
${{ if job_data.strategy }}:
1311
strategy: ${{ job_data.strategy }}
1412
${{ if job_data.dependsOn }}:

‎.pipelines/run-pipeline.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,37 +86,43 @@ stages:
8686
archiveVersion: $(AZURE_IPAM_VERSION)
8787
imageTag: $(Build.BuildNumber)
8888
packageWithDropGZ: True
89+
condition: and(succeeded(), ne($(AZURE_IPAM_VERSION), ''))
8990
azure_ip_masq_merger:
9091
name: azure-ip-masq-merger
9192
extraArgs: ''
9293
archiveName: azure-ip-masq-merger
9394
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
9495
imageTag: $(Build.BuildNumber)
96+
condition: and(succeeded(), ne($(AZURE_IP_MASQ_MERGER_VERSION), ''))
9597
cni:
9698
name: cni
9799
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
98100
archiveName: azure-cni
99101
archiveVersion: $(CNI_VERSION)
100102
imageTag: $(Build.BuildNumber)
101103
packageWithDropGZ: True
104+
condition: and(succeeded(), ne($(CNI_VERSION), ''))
102105
cns:
103106
name: cns
104107
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
105108
archiveName: azure-cns
106109
archiveVersion: $(CNS_VERSION)
107110
imageTag: $(Build.BuildNumber)
111+
condition: and(succeeded(), ne($(CNS_VERSION), ''))
108112
ipv6_hp_bpf:
109113
name: ipv6-hp-bpf
110114
extraArgs: "--build-arg DEBUG=$(System.Debug)"
111115
archiveName: ipv6-hp-bpf
112116
archiveVersion: $(IPV6_HP_BPF_VERSION)
113117
imageTag: $(Build.BuildNumber)
118+
condition: and(succeeded(), ne($(IPV6_HP_BPF_VERSION), ''))
114119
npm:
115120
name: npm
116121
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
117122
archiveName: azure-npm
118123
archiveVersion: $(NPM_VERSION)
119124
imageTag: $(Build.BuildNumber)
125+
condition: and(succeeded(), ne($(NPM_VERSION), ''))
120126

121127
- job: windows_amd64
122128
displayName: "Windows"
@@ -134,25 +140,29 @@ stages:
134140
archiveVersion: $(AZURE_IPAM_VERSION)
135141
imageTag: $(Build.BuildNumber)
136142
packageWithDropGZ: True
143+
condition: and(succeeded(), ne($(AZURE_IPAM_VERSION), ''))
137144
cni:
138145
name: cni
139146
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
140147
archiveName: azure-cni
141148
archiveVersion: $(CNI_VERSION)
142149
imageTag: $(Build.BuildNumber)
143150
packageWithDropGZ: True
151+
condition: and(succeeded(), ne($(CNI_VERSION), ''))
144152
cns:
145153
name: cns
146154
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
147155
archiveName: azure-cns
148156
archiveVersion: $(CNS_VERSION)
149157
imageTag: $(Build.BuildNumber)
158+
condition: and(succeeded(), ne($(CNS_VERSION), ''))
150159
npm:
151160
name: npm
152161
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
153162
archiveName: azure-npm
154163
archiveVersion: $(NPM_VERSION)
155164
imageTag: $(Build.BuildNumber)
165+
condition: and(succeeded(), ne($(NPM_VERSION), ''))
156166

157167
- job: linux_arm64
158168
displayName: "Linux/ARM64"
@@ -170,37 +180,43 @@ stages:
170180
extraArgs: ''
171181
imageTag: $(Build.BuildNumber)
172182
packageWithDropGZ: True
183+
condition: and(succeeded(), ne($(AZURE_IPAM_VERSION), ''))
173184
azure_ip_masq_merger:
174185
name: azure-ip-masq-merger
175186
extraArgs: ''
176187
archiveName: azure-ip-masq-merger
177188
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
178189
imageTag: $(Build.BuildNumber)
190+
condition: and(succeeded(), ne($(AZURE_IP_MASQ_MERGER_VERSION), ''))
179191
cni:
180192
name: cni
181193
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
182194
archiveName: azure-cni
183195
archiveVersion: $(CNI_VERSION)
184196
imageTag: $(Build.BuildNumber)
185197
packageWithDropGZ: True
198+
condition: and(succeeded(), ne($(CNI_VERSION), ''))
186199
cns:
187200
name: cns
188201
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
189202
archiveName: azure-cns
190203
archiveVersion: $(CNS_VERSION)
191204
imageTag: $(Build.BuildNumber)
205+
condition: and(succeeded(), ne($(CNS_VERSION), ''))
192206
ipv6_hp_bpf:
193207
name: ipv6-hp-bpf
194208
extraArgs: "--build-arg DEBUG=$(System.Debug)"
195209
archiveName: ipv6-hp-bpf
196210
archiveVersion: $(IPV6_HP_BPF_VERSION)
197211
imageTag: $(Build.BuildNumber)
212+
condition: and(succeeded(), ne($(IPV6_HP_BPF_VERSION), ''))
198213
npm:
199214
name: npm
200215
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
201216
archiveName: azure-npm
202217
archiveVersion: $(NPM_VERSION)
203218
imageTag: $(Build.BuildNumber)
219+
condition: and(succeeded(), ne($(NPM_VERSION), ''))
204220

205221
- ${{ if not(contains(variables['Build.SourceBranch'], 'refs/pull')) }}:
206222
- stage: manifests

0 commit comments

Comments
 (0)