@@ -44,164 +44,6 @@ stages:
4444
4545- template : templates/run-unit-tests.stages.yaml@acn-devops
4646
47- # - stage: build
48- # displayName: "Build Project"
49- # dependsOn:
50- # - setup
51- # - unittest
52- # variables:
53- # ACN_DIR: drop_setup_env_source
54- # ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
55- # CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
56- # CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
57- # NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata
58-
59- # STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
60- # TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
61-
62- # IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
63- # AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
64- # AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
65- # CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
66- # CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
67- # IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
68- # NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
69- # jobs:
70- # - template: /.pipelines/build/images.jobs.yaml@acn-devops
71- # parameters:
72- # images:
73- # - job: linux_amd64
74- # displayName: "Linux/AMD64"
75- # templateContext:
76- # repositoryArtifact: drop_setup_env_source
77- # buildScript: .pipelines/build/scripts/$(name).sh
78- # obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
79- # strategy:
80- # maxParallel: 5
81- # matrix:
82- # azure_ipam:
83- # name: azure-ipam
84- # extraArgs: ''
85- # archiveName: azure-ipam
86- # archiveVersion: $(AZURE_IPAM_VERSION)
87- # imageTag: $(Build.BuildNumber)
88- # packageWithDropGZ: True
89- # azure_ip_masq_merger:
90- # name: azure-ip-masq-merger
91- # extraArgs: ''
92- # archiveName: azure-ip-masq-merger
93- # archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
94- # imageTag: $(Build.BuildNumber)
95- # cni:
96- # name: cni
97- # extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
98- # archiveName: azure-cni
99- # archiveVersion: $(CNI_VERSION)
100- # imageTag: $(Build.BuildNumber)
101- # packageWithDropGZ: True
102- # cns:
103- # name: cns
104- # extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
105- # archiveName: azure-cns
106- # archiveVersion: $(CNS_VERSION)
107- # imageTag: $(Build.BuildNumber)
108- # ipv6_hp_bpf:
109- # name: ipv6-hp-bpf
110- # extraArgs: "--build-arg DEBUG=$(System.Debug)"
111- # archiveName: ipv6-hp-bpf
112- # archiveVersion: $(IPV6_HP_BPF_VERSION)
113- # imageTag: $(Build.BuildNumber)
114- # npm:
115- # name: npm
116- # extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
117- # archiveName: azure-npm
118- # archiveVersion: $(NPM_VERSION)
119- # imageTag: $(Build.BuildNumber)
120-
121- # - job: windows_amd64
122- # displayName: "Windows"
123- # templateContext:
124- # repositoryArtifact: drop_setup_env_source
125- # buildScript: .pipelines/build/scripts/$(name).sh
126- # obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
127- # strategy:
128- # maxParallel: 5
129- # matrix:
130- # azure_ipam:
131- # name: azure-ipam
132- # extraArgs: ''
133- # archiveName: azure-ipam
134- # archiveVersion: $(AZURE_IPAM_VERSION)
135- # imageTag: $(Build.BuildNumber)
136- # packageWithDropGZ: True
137- # cni:
138- # name: cni
139- # extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
140- # archiveName: azure-cni
141- # archiveVersion: $(CNI_VERSION)
142- # imageTag: $(Build.BuildNumber)
143- # packageWithDropGZ: True
144- # cns:
145- # name: cns
146- # extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
147- # archiveName: azure-cns
148- # archiveVersion: $(CNS_VERSION)
149- # imageTag: $(Build.BuildNumber)
150- # npm:
151- # name: npm
152- # extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
153- # archiveName: azure-npm
154- # archiveVersion: $(NPM_VERSION)
155- # imageTag: $(Build.BuildNumber)
156-
157- # - job: linux_arm64
158- # displayName: "Linux/ARM64"
159- # templateContext:
160- # repositoryArtifact: drop_setup_env_source
161- # buildScript: .pipelines/build/scripts/$(name).sh
162- # obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
163- # strategy:
164- # maxParallel: 3
165- # matrix:
166- # azure_ipam:
167- # name: azure-ipam
168- # archiveName: azure-ipam
169- # archiveVersion: $(AZURE_IPAM_VERSION)
170- # extraArgs: ''
171- # imageTag: $(Build.BuildNumber)
172- # packageWithDropGZ: True
173- # azure_ip_masq_merger:
174- # name: azure-ip-masq-merger
175- # extraArgs: ''
176- # archiveName: azure-ip-masq-merger
177- # archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
178- # imageTag: $(Build.BuildNumber)
179- # cni:
180- # name: cni
181- # extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
182- # archiveName: azure-cni
183- # archiveVersion: $(CNI_VERSION)
184- # imageTag: $(Build.BuildNumber)
185- # packageWithDropGZ: True
186- # cns:
187- # name: cns
188- # extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
189- # archiveName: azure-cns
190- # archiveVersion: $(CNS_VERSION)
191- # imageTag: $(Build.BuildNumber)
192- # ipv6_hp_bpf:
193- # name: ipv6-hp-bpf
194- # extraArgs: "--build-arg DEBUG=$(System.Debug)"
195- # archiveName: ipv6-hp-bpf
196- # archiveVersion: $(IPV6_HP_BPF_VERSION)
197- # imageTag: $(Build.BuildNumber)
198- # npm:
199- # name: npm
200- # extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
201- # archiveName: azure-npm
202- # archiveVersion: $(NPM_VERSION)
203- # imageTag: $(Build.BuildNumber)
204-
20547- stage : build
20648 displayName : " Build Project"
20749 dependsOn :
@@ -225,7 +67,7 @@ stages:
22567 IPV6_HP_BPF_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
22668 NPM_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
22769 jobs :
228- - template : /.pipelines/build/images.jobs.yaml
70+ - template : /.pipelines/build/images.jobs.yaml@acn-devops
22971 parameters :
23072 images :
23173 - job : linux_amd64
@@ -269,12 +111,12 @@ stages:
269111 archiveName : ipv6-hp-bpf
270112 archiveVersion : $(IPV6_HP_BPF_VERSION)
271113 imageTag : $(Build.BuildNumber)
272- # npm:
273- # name: npm
274- # extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
275- # archiveName: azure-npm
276- # archiveVersion: $(NPM_VERSION)
277- # imageTag: $(Build.BuildNumber)
114+ npm :
115+ name : npm
116+ extraArgs : ' --build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
117+ archiveName : azure-npm
118+ archiveVersion : $(NPM_VERSION)
119+ imageTag : $(Build.BuildNumber)
278120
279121 - job : windows_amd64
280122 displayName : " Windows"
@@ -305,12 +147,12 @@ stages:
305147 archiveName : azure-cns
306148 archiveVersion : $(CNS_VERSION)
307149 imageTag : $(Build.BuildNumber)
308- # npm:
309- # name: npm
310- # extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
311- # archiveName: azure-npm
312- # archiveVersion: $(NPM_VERSION)
313- # imageTag: $(Build.BuildNumber)
150+ npm :
151+ name : npm
152+ extraArgs : ' --build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
153+ archiveName : azure-npm
154+ archiveVersion : $(NPM_VERSION)
155+ imageTag : $(Build.BuildNumber)
314156
315157 - job : linux_arm64
316158 displayName : " Linux/ARM64"
@@ -353,12 +195,170 @@ stages:
353195 archiveName : ipv6-hp-bpf
354196 archiveVersion : $(IPV6_HP_BPF_VERSION)
355197 imageTag : $(Build.BuildNumber)
356- # npm:
357- # name: npm
358- # extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
359- # archiveName: azure-npm
360- # archiveVersion: $(NPM_VERSION)
361- # imageTag: $(Build.BuildNumber)
198+ npm :
199+ name : npm
200+ extraArgs : ' --build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
201+ archiveName : azure-npm
202+ archiveVersion : $(NPM_VERSION)
203+ imageTag : $(Build.BuildNumber)
204+
205+ # - stage: build
206+ # displayName: "Build Project"
207+ # dependsOn:
208+ # - setup
209+ # - unittest
210+ # variables:
211+ # ACN_DIR: drop_setup_env_source
212+ # ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
213+ # CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
214+ # CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
215+ # NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata
216+
217+ # STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
218+ # TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
219+
220+ # IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
221+ # AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
222+ # AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
223+ # CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
224+ # CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
225+ # IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
226+ # NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
227+ # jobs:
228+ # - template: /.pipelines/build/images.jobs.yaml
229+ # parameters:
230+ # images:
231+ # - job: linux_amd64
232+ # displayName: "Linux/AMD64"
233+ # templateContext:
234+ # repositoryArtifact: drop_setup_env_source
235+ # buildScript: .pipelines/build/scripts/$(name).sh
236+ # obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
237+ # strategy:
238+ # maxParallel: 5
239+ # matrix:
240+ # azure_ipam:
241+ # name: azure-ipam
242+ # extraArgs: ''
243+ # archiveName: azure-ipam
244+ # archiveVersion: $(AZURE_IPAM_VERSION)
245+ # imageTag: $(Build.BuildNumber)
246+ # packageWithDropGZ: True
247+ # azure_ip_masq_merger:
248+ # name: azure-ip-masq-merger
249+ # extraArgs: ''
250+ # archiveName: azure-ip-masq-merger
251+ # archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
252+ # imageTag: $(Build.BuildNumber)
253+ # cni:
254+ # name: cni
255+ # extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
256+ # archiveName: azure-cni
257+ # archiveVersion: $(CNI_VERSION)
258+ # imageTag: $(Build.BuildNumber)
259+ # packageWithDropGZ: True
260+ # cns:
261+ # name: cns
262+ # extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
263+ # archiveName: azure-cns
264+ # archiveVersion: $(CNS_VERSION)
265+ # imageTag: $(Build.BuildNumber)
266+ # ipv6_hp_bpf:
267+ # name: ipv6-hp-bpf
268+ # extraArgs: "--build-arg DEBUG=$(System.Debug)"
269+ # archiveName: ipv6-hp-bpf
270+ # archiveVersion: $(IPV6_HP_BPF_VERSION)
271+ # imageTag: $(Build.BuildNumber)
272+ # # npm:
273+ # # name: npm
274+ # # extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
275+ # # archiveName: azure-npm
276+ # # archiveVersion: $(NPM_VERSION)
277+ # # imageTag: $(Build.BuildNumber)
278+
279+ # - job: windows_amd64
280+ # displayName: "Windows"
281+ # templateContext:
282+ # repositoryArtifact: drop_setup_env_source
283+ # buildScript: .pipelines/build/scripts/$(name).sh
284+ # obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
285+ # strategy:
286+ # maxParallel: 5
287+ # matrix:
288+ # azure_ipam:
289+ # name: azure-ipam
290+ # extraArgs: ''
291+ # archiveName: azure-ipam
292+ # archiveVersion: $(AZURE_IPAM_VERSION)
293+ # imageTag: $(Build.BuildNumber)
294+ # packageWithDropGZ: True
295+ # cni:
296+ # name: cni
297+ # extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
298+ # archiveName: azure-cni
299+ # archiveVersion: $(CNI_VERSION)
300+ # imageTag: $(Build.BuildNumber)
301+ # packageWithDropGZ: True
302+ # cns:
303+ # name: cns
304+ # extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
305+ # archiveName: azure-cns
306+ # archiveVersion: $(CNS_VERSION)
307+ # imageTag: $(Build.BuildNumber)
308+ # # npm:
309+ # # name: npm
310+ # # extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
311+ # # archiveName: azure-npm
312+ # # archiveVersion: $(NPM_VERSION)
313+ # # imageTag: $(Build.BuildNumber)
314+
315+ # - job: linux_arm64
316+ # displayName: "Linux/ARM64"
317+ # templateContext:
318+ # repositoryArtifact: drop_setup_env_source
319+ # buildScript: .pipelines/build/scripts/$(name).sh
320+ # obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
321+ # strategy:
322+ # maxParallel: 3
323+ # matrix:
324+ # azure_ipam:
325+ # name: azure-ipam
326+ # archiveName: azure-ipam
327+ # archiveVersion: $(AZURE_IPAM_VERSION)
328+ # extraArgs: ''
329+ # imageTag: $(Build.BuildNumber)
330+ # packageWithDropGZ: True
331+ # azure_ip_masq_merger:
332+ # name: azure-ip-masq-merger
333+ # extraArgs: ''
334+ # archiveName: azure-ip-masq-merger
335+ # archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
336+ # imageTag: $(Build.BuildNumber)
337+ # cni:
338+ # name: cni
339+ # extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
340+ # archiveName: azure-cni
341+ # archiveVersion: $(CNI_VERSION)
342+ # imageTag: $(Build.BuildNumber)
343+ # packageWithDropGZ: True
344+ # cns:
345+ # name: cns
346+ # extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
347+ # archiveName: azure-cns
348+ # archiveVersion: $(CNS_VERSION)
349+ # imageTag: $(Build.BuildNumber)
350+ # ipv6_hp_bpf:
351+ # name: ipv6-hp-bpf
352+ # extraArgs: "--build-arg DEBUG=$(System.Debug)"
353+ # archiveName: ipv6-hp-bpf
354+ # archiveVersion: $(IPV6_HP_BPF_VERSION)
355+ # imageTag: $(Build.BuildNumber)
356+ # # npm:
357+ # # name: npm
358+ # # extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
359+ # # archiveName: azure-npm
360+ # # archiveVersion: $(NPM_VERSION)
361+ # # imageTag: $(Build.BuildNumber)
362362
363363
364364- ${{ if not(contains(variables['Build.SourceBranch'], 'refs/pull')) }} :
0 commit comments