Skip to content

Commit 573c1a4

Browse files
jpayne3506jpayne3506
committed
test: specify old tag
1 parent e93cb70 commit 573c1a4

File tree

2 files changed

+165
-169
lines changed

2 files changed

+165
-169
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
parameters:
22
- name: images
33
type: jobList
4-
- name: stageName
5-
type: string
6-
default: "build_acndevops"
4+
75

86
jobs:
97
- ${{ each job_data in parameters.images }}:
@@ -78,15 +76,15 @@ jobs:
7876
- task: ShellScript@2
7977
displayName: "Package with DropGZ"
8078
condition: and(
81-
succeeded(),
79+
succeeded(),
8280
eq(variables.packageWithDropGZ, 'True'))
8381
inputs:
8482
scriptPath: $(REPO_ROOT)/.pipelines/build/scripts/dropgz.sh
8583

8684
- ${{ if not(contains(job_data.job, 'linux')) }}:
8785
- task: onebranch.pipeline.signing@1
8886
condition: and(
89-
succeeded(),
87+
succeeded(),
9088
eq(variables.packageWithDropGZ, 'True'))
9189
inputs:
9290
command: 'sign'
@@ -96,7 +94,7 @@ jobs:
9694

9795
# OneBranch artifacts are stored on a Windows machine which obliterates
9896
# Linux file permissions.
99-
# This task is added (along with ob_extract_root_artifact in jobs that
97+
# This task is added (along with ob_extract_root_artifact in jobs that
10098
# download the artifact) to protect those file permissions from changing
10199
# during image build time.
102100
#
@@ -148,4 +146,4 @@ jobs:
148146
build_tag: $(imageTag)
149147
extra_args: $(extraArgs) --build-arg ARTIFACT_DIR="/__w/1/a"
150148
archive_file: $(archiveName)-$(OS)-$(ARCH)-$(archiveVersion)
151-
source: drop_${{ parameters.stageName }}_pkg_${{ job_data.job }}_$(name)
149+
source: drop_build_pkg_${{ job_data.job }}_$(name)

‎.pipelines/run-pipeline.yaml‎

Lines changed: 160 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -44,167 +44,166 @@ stages:
4444

4545
- template: templates/run-unit-tests.stages.yaml@acn-devops
4646

47-
- stage: build_acndevops
48-
displayName: "Build Project PR"
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-
stageName: "build_acndevops"
73-
images:
74-
- job: linux_amd64
75-
displayName: "Linux/AMD64"
76-
templateContext:
77-
repositoryArtifact: drop_setup_env_source
78-
buildScript: .pipelines/build/scripts/$(name).sh
79-
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
80-
strategy:
81-
maxParallel: 5
82-
matrix:
83-
azure_ipam:
84-
name: azure-ipam
85-
extraArgs: ''
86-
archiveName: azure-ipam
87-
archiveVersion: $(AZURE_IPAM_VERSION)
88-
imageTag: $(Build.BuildNumber)
89-
packageWithDropGZ: True
90-
azure_ip_masq_merger:
91-
name: azure-ip-masq-merger
92-
extraArgs: ''
93-
archiveName: azure-ip-masq-merger
94-
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
95-
imageTag: $(Build.BuildNumber)
96-
cni:
97-
name: cni
98-
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
99-
archiveName: azure-cni
100-
archiveVersion: $(CNI_VERSION)
101-
imageTag: $(Build.BuildNumber)
102-
packageWithDropGZ: True
103-
cns:
104-
name: cns
105-
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
106-
archiveName: azure-cns
107-
archiveVersion: $(CNS_VERSION)
108-
imageTag: $(Build.BuildNumber)
109-
ipv6_hp_bpf:
110-
name: ipv6-hp-bpf
111-
extraArgs: "--build-arg DEBUG=$(System.Debug)"
112-
archiveName: ipv6-hp-bpf
113-
archiveVersion: $(IPV6_HP_BPF_VERSION)
114-
imageTag: $(Build.BuildNumber)
115-
npm:
116-
name: npm
117-
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
118-
archiveName: azure-npm
119-
archiveVersion: $(NPM_VERSION)
120-
imageTag: $(Build.BuildNumber)
121-
122-
- job: windows_amd64
123-
displayName: "Windows"
124-
templateContext:
125-
repositoryArtifact: drop_setup_env_source
126-
buildScript: .pipelines/build/scripts/$(name).sh
127-
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
128-
strategy:
129-
maxParallel: 5
130-
matrix:
131-
azure_ipam:
132-
name: azure-ipam
133-
extraArgs: ''
134-
archiveName: azure-ipam
135-
archiveVersion: $(AZURE_IPAM_VERSION)
136-
imageTag: $(Build.BuildNumber)
137-
packageWithDropGZ: True
138-
cni:
139-
name: cni
140-
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
141-
archiveName: azure-cni
142-
archiveVersion: $(CNI_VERSION)
143-
imageTag: $(Build.BuildNumber)
144-
packageWithDropGZ: True
145-
cns:
146-
name: cns
147-
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
148-
archiveName: azure-cns
149-
archiveVersion: $(CNS_VERSION)
150-
imageTag: $(Build.BuildNumber)
151-
npm:
152-
name: npm
153-
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
154-
archiveName: azure-npm
155-
archiveVersion: $(NPM_VERSION)
156-
imageTag: $(Build.BuildNumber)
157-
158-
- job: linux_arm64
159-
displayName: "Linux/ARM64"
160-
templateContext:
161-
repositoryArtifact: drop_setup_env_source
162-
buildScript: .pipelines/build/scripts/$(name).sh
163-
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
164-
strategy:
165-
maxParallel: 3
166-
matrix:
167-
azure_ipam:
168-
name: azure-ipam
169-
archiveName: azure-ipam
170-
archiveVersion: $(AZURE_IPAM_VERSION)
171-
extraArgs: ''
172-
imageTag: $(Build.BuildNumber)
173-
packageWithDropGZ: True
174-
azure_ip_masq_merger:
175-
name: azure-ip-masq-merger
176-
extraArgs: ''
177-
archiveName: azure-ip-masq-merger
178-
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
179-
imageTag: $(Build.BuildNumber)
180-
cni:
181-
name: cni
182-
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
183-
archiveName: azure-cni
184-
archiveVersion: $(CNI_VERSION)
185-
imageTag: $(Build.BuildNumber)
186-
packageWithDropGZ: True
187-
cns:
188-
name: cns
189-
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
190-
archiveName: azure-cns
191-
archiveVersion: $(CNS_VERSION)
192-
imageTag: $(Build.BuildNumber)
193-
ipv6_hp_bpf:
194-
name: ipv6-hp-bpf
195-
extraArgs: "--build-arg DEBUG=$(System.Debug)"
196-
archiveName: ipv6-hp-bpf
197-
archiveVersion: $(IPV6_HP_BPF_VERSION)
198-
imageTag: $(Build.BuildNumber)
199-
npm:
200-
name: npm
201-
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
202-
archiveName: azure-npm
203-
archiveVersion: $(NPM_VERSION)
204-
imageTag: $(Build.BuildNumber)
205-
206-
- stage: build_release
207-
displayName: "Build Project Release"
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+
205+
- stage: build
206+
displayName: "Build Project"
208207
dependsOn:
209208
- setup
210209
- unittest
@@ -228,7 +227,6 @@ stages:
228227
jobs:
229228
- template: /.pipelines/build/images.jobs.yaml
230229
parameters:
231-
stageName: "build_release"
232230
images:
233231
- job: linux_amd64
234232
displayName: "Linux/AMD64"

0 commit comments

Comments
 (0)