Skip to content

Commit ed7b5e7

Browse files
jpayne3506apontejajsheylatrudo
authored
ci: backport relevant signing changes to release/v1.6 (#3862)
* Fixing build pipeline for 1.6 release * ci: Remove File Copy and Add Image Build Stage to Regular Build (#3769) * Remove File Copy * Add Image Builds to Regular Pipeline Execution * ci: enable NPM build --------- Co-authored-by: Amilcar Aponte Jimenez <[email protected]> Co-authored-by: sheylatrudo <[email protected]>
1 parent cd07f4c commit ed7b5e7

File tree

3 files changed

+165
-166
lines changed

3 files changed

+165
-166
lines changed

‎.pipelines/build/ob-prepare.steps.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ steps:
1717
# target_path: npm-windows
1818
# source_dockerfile: windows.Dockerfile
1919

20-
# - template: utils/rename-dockerfile-references.steps.yaml
21-
# parameters:
22-
# topic: "Linux - npm"
23-
# replace_references: true
24-
# working_directory: $(ACN_DIR)
25-
# source_path: npm
26-
# target_path: npm
27-
# source_dockerfile: linux.Dockerfile
20+
- template: utils/rename-dockerfile-references.steps.yaml
21+
parameters:
22+
topic: "Linux - npm"
23+
replace_references: true
24+
working_directory: $(ACN_DIR)
25+
source_path: npm
26+
target_path: npm
27+
source_dockerfile: linux.Dockerfile
2828

2929
- bash: |
3030
rm -rf .hooks .github

‎.pipelines/run-pipeline.yaml‎

Lines changed: 157 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -20,154 +20,154 @@ stages:
2020

2121
- template: templates/run-unit-tests.stages.yaml
2222

23-
24-
- ${{ if not(contains(variables['Build.SourceBranch'], 'refs/pull')) }}:
25-
- stage: build
26-
displayName: "Build Project"
27-
dependsOn:
28-
- setup
29-
- unittest
30-
variables:
31-
ACN_DIR: drop_setup_env_source
32-
ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
33-
CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
34-
CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
35-
NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata
36-
37-
STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
38-
TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
39-
40-
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
41-
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
42-
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
43-
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
44-
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
45-
NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
46-
jobs:
47-
- template: /.pipelines/build/images.jobs.yaml
48-
parameters:
49-
images:
50-
- job: linux_amd64
51-
displayName: "Linux/AMD64"
52-
templateContext:
53-
repositoryArtifact: drop_setup_env_source
54-
buildScript: .pipelines/build/scripts/$(name).sh
55-
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
56-
strategy:
57-
maxParallel: 5
58-
matrix:
59-
azure_ipam:
60-
name: azure-ipam
61-
extraArgs: ''
62-
archiveName: azure-ipam
63-
archiveVersion: $(AZURE_IPAM_VERSION)
64-
imageTag: $(Build.BuildNumber)
65-
packageWithDropGZ: True
66-
cni:
67-
name: cni
68-
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
69-
archiveName: azure-cni
70-
archiveVersion: $(CNI_VERSION)
71-
imageTag: $(Build.BuildNumber)
72-
packageWithDropGZ: True
73-
cns:
74-
name: cns
75-
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
76-
archiveName: azure-cns
77-
archiveVersion: $(CNS_VERSION)
78-
imageTag: $(Build.BuildNumber)
79-
ipv6_hp_bpf:
80-
name: ipv6-hp-bpf
81-
extraArgs: "--build-arg DEBUG=$(System.Debug)"
82-
archiveName: ipv6-hp-bpf
83-
archiveVersion: $(IPV6_HP_BPF_VERSION)
84-
imageTag: $(Build.BuildNumber)
85-
# npm:
86-
# name: npm
87-
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
88-
# archiveName: azure-npm
89-
# archiveVersion: $(NPM_VERSION)
90-
# imageTag: $(Build.BuildNumber)
91-
92-
- job: windows_amd64
93-
displayName: "Windows"
94-
templateContext:
95-
repositoryArtifact: drop_setup_env_source
96-
buildScript: .pipelines/build/scripts/$(name).sh
97-
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
98-
strategy:
99-
maxParallel: 5
100-
matrix:
101-
azure_ipam:
102-
name: azure-ipam
103-
extraArgs: ''
104-
archiveName: azure-ipam
105-
archiveVersion: $(AZURE_IPAM_VERSION)
106-
imageTag: $(Build.BuildNumber)
107-
packageWithDropGZ: True
108-
cni:
109-
name: cni
110-
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
111-
archiveName: azure-cni
112-
archiveVersion: $(CNI_VERSION)
113-
imageTag: $(Build.BuildNumber)
114-
packageWithDropGZ: True
115-
cns:
116-
name: cns
117-
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
118-
archiveName: azure-cns
119-
archiveVersion: $(CNS_VERSION)
120-
imageTag: $(Build.BuildNumber)
121-
# npm:
122-
# name: npm
123-
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
124-
# archiveName: azure-npm
125-
# archiveVersion: $(NPM_VERSION)
126-
# imageTag: $(Build.BuildNumber)
127-
128-
- job: linux_arm64
129-
displayName: "Linux/ARM64"
130-
templateContext:
131-
repositoryArtifact: drop_setup_env_source
132-
buildScript: .pipelines/build/scripts/$(name).sh
133-
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
134-
strategy:
135-
maxParallel: 3
136-
matrix:
137-
azure_ipam:
138-
name: azure-ipam
139-
archiveName: azure-ipam
140-
archiveVersion: $(AZURE_IPAM_VERSION)
141-
extraArgs: ''
142-
imageTag: $(Build.BuildNumber)
143-
packageWithDropGZ: True
144-
cni:
145-
name: cni
146-
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
147-
archiveName: azure-cni
148-
archiveVersion: $(CNI_VERSION)
149-
imageTag: $(Build.BuildNumber)
150-
packageWithDropGZ: True
151-
cns:
152-
name: cns
153-
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
154-
archiveName: azure-cns
155-
archiveVersion: $(CNS_VERSION)
156-
imageTag: $(Build.BuildNumber)
157-
ipv6_hp_bpf:
158-
name: ipv6-hp-bpf
159-
extraArgs: "--build-arg DEBUG=$(System.Debug)"
160-
archiveName: ipv6-hp-bpf
161-
archiveVersion: $(IPV6_HP_BPF_VERSION)
162-
imageTag: $(Build.BuildNumber)
163-
# npm:
164-
# name: npm
165-
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
166-
# archiveName: azure-npm
167-
# archiveVersion: $(NPM_VERSION)
168-
# imageTag: $(Build.BuildNumber)
23+
- stage: build
24+
displayName: "Build Project"
25+
dependsOn:
26+
- setup
27+
- unittest
28+
variables:
29+
ACN_DIR: drop_setup_env_source
30+
ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
31+
CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
32+
CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
33+
NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata
34+
35+
STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
36+
TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
37+
38+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
39+
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
40+
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
41+
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
42+
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
43+
NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
44+
jobs:
45+
- template: /.pipelines/build/images.jobs.yaml
46+
parameters:
47+
images:
48+
- job: linux_amd64
49+
displayName: "Linux/AMD64"
50+
templateContext:
51+
repositoryArtifact: drop_setup_env_source
52+
buildScript: .pipelines/build/scripts/$(name).sh
53+
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
54+
strategy:
55+
maxParallel: 5
56+
matrix:
57+
azure_ipam:
58+
name: azure-ipam
59+
extraArgs: ''
60+
archiveName: azure-ipam
61+
archiveVersion: $(AZURE_IPAM_VERSION)
62+
imageTag: $(Build.BuildNumber)
63+
packageWithDropGZ: True
64+
cni:
65+
name: cni
66+
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
67+
archiveName: azure-cni
68+
archiveVersion: $(CNI_VERSION)
69+
imageTag: $(Build.BuildNumber)
70+
packageWithDropGZ: True
71+
cns:
72+
name: cns
73+
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
74+
archiveName: azure-cns
75+
archiveVersion: $(CNS_VERSION)
76+
imageTag: $(Build.BuildNumber)
77+
ipv6_hp_bpf:
78+
name: ipv6-hp-bpf
79+
extraArgs: "--build-arg DEBUG=$(System.Debug)"
80+
archiveName: ipv6-hp-bpf
81+
archiveVersion: $(IPV6_HP_BPF_VERSION)
82+
imageTag: $(Build.BuildNumber)
83+
npm:
84+
name: npm
85+
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
86+
archiveName: azure-npm
87+
archiveVersion: $(NPM_VERSION)
88+
imageTag: $(Build.BuildNumber)
89+
90+
- job: windows_amd64
91+
displayName: "Windows"
92+
templateContext:
93+
repositoryArtifact: drop_setup_env_source
94+
buildScript: .pipelines/build/scripts/$(name).sh
95+
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
96+
strategy:
97+
maxParallel: 5
98+
matrix:
99+
azure_ipam:
100+
name: azure-ipam
101+
extraArgs: ''
102+
archiveName: azure-ipam
103+
archiveVersion: $(AZURE_IPAM_VERSION)
104+
imageTag: $(Build.BuildNumber)
105+
packageWithDropGZ: True
106+
cni:
107+
name: cni
108+
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
109+
archiveName: azure-cni
110+
archiveVersion: $(CNI_VERSION)
111+
imageTag: $(Build.BuildNumber)
112+
packageWithDropGZ: True
113+
cns:
114+
name: cns
115+
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
116+
archiveName: azure-cns
117+
archiveVersion: $(CNS_VERSION)
118+
imageTag: $(Build.BuildNumber)
119+
# We do not build NPM for Windows 1.6+
120+
# npm:
121+
# name: npm
122+
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
123+
# archiveName: azure-npm
124+
# archiveVersion: $(NPM_VERSION)
125+
# imageTag: $(Build.BuildNumber)
126+
127+
- job: linux_arm64
128+
displayName: "Linux/ARM64"
129+
templateContext:
130+
repositoryArtifact: drop_setup_env_source
131+
buildScript: .pipelines/build/scripts/$(name).sh
132+
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
133+
strategy:
134+
maxParallel: 3
135+
matrix:
136+
azure_ipam:
137+
name: azure-ipam
138+
archiveName: azure-ipam
139+
archiveVersion: $(AZURE_IPAM_VERSION)
140+
extraArgs: ''
141+
imageTag: $(Build.BuildNumber)
142+
packageWithDropGZ: True
143+
cni:
144+
name: cni
145+
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
146+
archiveName: azure-cni
147+
archiveVersion: $(CNI_VERSION)
148+
imageTag: $(Build.BuildNumber)
149+
packageWithDropGZ: True
150+
cns:
151+
name: cns
152+
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
153+
archiveName: azure-cns
154+
archiveVersion: $(CNS_VERSION)
155+
imageTag: $(Build.BuildNumber)
156+
ipv6_hp_bpf:
157+
name: ipv6-hp-bpf
158+
extraArgs: "--build-arg DEBUG=$(System.Debug)"
159+
archiveName: ipv6-hp-bpf
160+
archiveVersion: $(IPV6_HP_BPF_VERSION)
161+
imageTag: $(Build.BuildNumber)
162+
npm:
163+
name: npm
164+
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
165+
archiveName: azure-npm
166+
archiveVersion: $(NPM_VERSION)
167+
imageTag: $(Build.BuildNumber)
169168

170169

170+
- ${{ if not(contains(variables['Build.SourceBranch'], 'refs/pull')) }}:
171171
- stage: manifests
172172
displayName: "Image Manifests"
173173
dependsOn:
@@ -247,17 +247,17 @@ stages:
247247
imageReference: $(IPV6_LINUX_AMD64_REF)
248248
- platform: linux/arm64
249249
imageReference: $(IPV6_LINUX_ARM64_REF)
250-
# - job: npm
251-
# templateContext:
252-
# name: npm
253-
# image_tag: $(NPM_VERSION)
254-
# platforms:
255-
# - platform: linux/amd64
256-
# imageReference: $(NPM_LINUX_AMD64_REF)
257-
# - platform: linux/arm64
258-
# imageReference: $(NPM_LINUX_ARM64_REF)
259-
# - platform: windows/amd64
260-
# imageReference: $(NPM_WINDOWS_AMD64_REF)
250+
- job: npm
251+
templateContext:
252+
name: npm
253+
image_tag: $(NPM_VERSION)
254+
platforms:
255+
- platform: linux/amd64
256+
imageReference: $(NPM_LINUX_AMD64_REF)
257+
- platform: linux/arm64
258+
imageReference: $(NPM_LINUX_ARM64_REF)
259+
# - platform: windows/amd64
260+
# imageReference: $(NPM_WINDOWS_AMD64_REF)
261261

262262

263263
# Cilium Podsubnet E2E tests

‎.pipelines/templates/run-unit-tests.stages.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ stages:
4747
} | { read xs; exit $xs; }
4848
} 4>&1
4949
50-
cp coverage-all.out "$COVERAGE_OUT"
5150
ls -la "$REPORT_DIR"
5251
retryCountOnTaskFailure: 3
5352
displayName: "Run Unit Tests - Linux"

0 commit comments

Comments
 (0)