Skip to content

Commit c639a4e

Browse files
sheylatrudosheylatrudo
authored
ci: Remove File Copy and Add Image Build Stage to Regular Build (#3769)
* Remove File Copy * Add Image Builds to Regular Pipeline Execution
1 parent 560cf9a commit c639a4e

File tree

2 files changed

+158
-160
lines changed

2 files changed

+158
-160
lines changed

‎.pipelines/run-pipeline.yaml‎

Lines changed: 158 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -20,167 +20,166 @@ 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-
AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
43-
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
44-
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
45-
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
46-
NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
47-
jobs:
48-
- template: /.pipelines/build/images.jobs.yaml
49-
parameters:
50-
images:
51-
- job: linux_amd64
52-
displayName: "Linux/AMD64"
53-
templateContext:
54-
repositoryArtifact: drop_setup_env_source
55-
buildScript: .pipelines/build/scripts/$(name).sh
56-
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
57-
strategy:
58-
maxParallel: 5
59-
matrix:
60-
azure_ipam:
61-
name: azure-ipam
62-
extraArgs: ''
63-
archiveName: azure-ipam
64-
archiveVersion: $(AZURE_IPAM_VERSION)
65-
imageTag: $(Build.BuildNumber)
66-
packageWithDropGZ: True
67-
azure_ip_masq_merger:
68-
name: azure-ip-masq-merger
69-
extraArgs: ''
70-
archiveName: azure-ip-masq-merger
71-
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
72-
imageTag: $(Build.BuildNumber)
73-
cni:
74-
name: cni
75-
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
76-
archiveName: azure-cni
77-
archiveVersion: $(CNI_VERSION)
78-
imageTag: $(Build.BuildNumber)
79-
packageWithDropGZ: True
80-
cns:
81-
name: cns
82-
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
83-
archiveName: azure-cns
84-
archiveVersion: $(CNS_VERSION)
85-
imageTag: $(Build.BuildNumber)
86-
ipv6_hp_bpf:
87-
name: ipv6-hp-bpf
88-
extraArgs: "--build-arg DEBUG=$(System.Debug)"
89-
archiveName: ipv6-hp-bpf
90-
archiveVersion: $(IPV6_HP_BPF_VERSION)
91-
imageTag: $(Build.BuildNumber)
92-
# npm:
93-
# name: npm
94-
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
95-
# archiveName: azure-npm
96-
# archiveVersion: $(NPM_VERSION)
97-
# imageTag: $(Build.BuildNumber)
98-
99-
- job: windows_amd64
100-
displayName: "Windows"
101-
templateContext:
102-
repositoryArtifact: drop_setup_env_source
103-
buildScript: .pipelines/build/scripts/$(name).sh
104-
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
105-
strategy:
106-
maxParallel: 5
107-
matrix:
108-
azure_ipam:
109-
name: azure-ipam
110-
extraArgs: ''
111-
archiveName: azure-ipam
112-
archiveVersion: $(AZURE_IPAM_VERSION)
113-
imageTag: $(Build.BuildNumber)
114-
packageWithDropGZ: True
115-
cni:
116-
name: cni
117-
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
118-
archiveName: azure-cni
119-
archiveVersion: $(CNI_VERSION)
120-
imageTag: $(Build.BuildNumber)
121-
packageWithDropGZ: True
122-
cns:
123-
name: cns
124-
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
125-
archiveName: azure-cns
126-
archiveVersion: $(CNS_VERSION)
127-
imageTag: $(Build.BuildNumber)
128-
# npm:
129-
# name: npm
130-
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
131-
# archiveName: azure-npm
132-
# archiveVersion: $(NPM_VERSION)
133-
# imageTag: $(Build.BuildNumber)
134-
135-
- job: linux_arm64
136-
displayName: "Linux/ARM64"
137-
templateContext:
138-
repositoryArtifact: drop_setup_env_source
139-
buildScript: .pipelines/build/scripts/$(name).sh
140-
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
141-
strategy:
142-
maxParallel: 3
143-
matrix:
144-
azure_ipam:
145-
name: azure-ipam
146-
archiveName: azure-ipam
147-
archiveVersion: $(AZURE_IPAM_VERSION)
148-
extraArgs: ''
149-
imageTag: $(Build.BuildNumber)
150-
packageWithDropGZ: True
151-
azure_ip_masq_merger:
152-
name: azure-ip-masq-merger
153-
extraArgs: ''
154-
archiveName: azure-ip-masq-merger
155-
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
156-
imageTag: $(Build.BuildNumber)
157-
cni:
158-
name: cni
159-
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
160-
archiveName: azure-cni
161-
archiveVersion: $(CNI_VERSION)
162-
imageTag: $(Build.BuildNumber)
163-
packageWithDropGZ: True
164-
cns:
165-
name: cns
166-
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
167-
archiveName: azure-cns
168-
archiveVersion: $(CNS_VERSION)
169-
imageTag: $(Build.BuildNumber)
170-
ipv6_hp_bpf:
171-
name: ipv6-hp-bpf
172-
extraArgs: "--build-arg DEBUG=$(System.Debug)"
173-
archiveName: ipv6-hp-bpf
174-
archiveVersion: $(IPV6_HP_BPF_VERSION)
175-
imageTag: $(Build.BuildNumber)
176-
# npm:
177-
# name: npm
178-
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
179-
# archiveName: azure-npm
180-
# archiveVersion: $(NPM_VERSION)
181-
# 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+
AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
41+
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
42+
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
43+
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
44+
NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
45+
jobs:
46+
- template: /.pipelines/build/images.jobs.yaml
47+
parameters:
48+
images:
49+
- job: linux_amd64
50+
displayName: "Linux/AMD64"
51+
templateContext:
52+
repositoryArtifact: drop_setup_env_source
53+
buildScript: .pipelines/build/scripts/$(name).sh
54+
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
55+
strategy:
56+
maxParallel: 5
57+
matrix:
58+
azure_ipam:
59+
name: azure-ipam
60+
extraArgs: ''
61+
archiveName: azure-ipam
62+
archiveVersion: $(AZURE_IPAM_VERSION)
63+
imageTag: $(Build.BuildNumber)
64+
packageWithDropGZ: True
65+
azure_ip_masq_merger:
66+
name: azure-ip-masq-merger
67+
extraArgs: ''
68+
archiveName: azure-ip-masq-merger
69+
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
70+
imageTag: $(Build.BuildNumber)
71+
cni:
72+
name: cni
73+
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
74+
archiveName: azure-cni
75+
archiveVersion: $(CNI_VERSION)
76+
imageTag: $(Build.BuildNumber)
77+
packageWithDropGZ: True
78+
cns:
79+
name: cns
80+
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
81+
archiveName: azure-cns
82+
archiveVersion: $(CNS_VERSION)
83+
imageTag: $(Build.BuildNumber)
84+
ipv6_hp_bpf:
85+
name: ipv6-hp-bpf
86+
extraArgs: "--build-arg DEBUG=$(System.Debug)"
87+
archiveName: ipv6-hp-bpf
88+
archiveVersion: $(IPV6_HP_BPF_VERSION)
89+
imageTag: $(Build.BuildNumber)
90+
# npm:
91+
# name: npm
92+
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
93+
# archiveName: azure-npm
94+
# archiveVersion: $(NPM_VERSION)
95+
# imageTag: $(Build.BuildNumber)
96+
97+
- job: windows_amd64
98+
displayName: "Windows"
99+
templateContext:
100+
repositoryArtifact: drop_setup_env_source
101+
buildScript: .pipelines/build/scripts/$(name).sh
102+
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
103+
strategy:
104+
maxParallel: 5
105+
matrix:
106+
azure_ipam:
107+
name: azure-ipam
108+
extraArgs: ''
109+
archiveName: azure-ipam
110+
archiveVersion: $(AZURE_IPAM_VERSION)
111+
imageTag: $(Build.BuildNumber)
112+
packageWithDropGZ: True
113+
cni:
114+
name: cni
115+
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
116+
archiveName: azure-cni
117+
archiveVersion: $(CNI_VERSION)
118+
imageTag: $(Build.BuildNumber)
119+
packageWithDropGZ: True
120+
cns:
121+
name: cns
122+
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
123+
archiveName: azure-cns
124+
archiveVersion: $(CNS_VERSION)
125+
imageTag: $(Build.BuildNumber)
126+
# npm:
127+
# name: npm
128+
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
129+
# archiveName: azure-npm
130+
# archiveVersion: $(NPM_VERSION)
131+
# imageTag: $(Build.BuildNumber)
132+
133+
- job: linux_arm64
134+
displayName: "Linux/ARM64"
135+
templateContext:
136+
repositoryArtifact: drop_setup_env_source
137+
buildScript: .pipelines/build/scripts/$(name).sh
138+
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
139+
strategy:
140+
maxParallel: 3
141+
matrix:
142+
azure_ipam:
143+
name: azure-ipam
144+
archiveName: azure-ipam
145+
archiveVersion: $(AZURE_IPAM_VERSION)
146+
extraArgs: ''
147+
imageTag: $(Build.BuildNumber)
148+
packageWithDropGZ: True
149+
azure_ip_masq_merger:
150+
name: azure-ip-masq-merger
151+
extraArgs: ''
152+
archiveName: azure-ip-masq-merger
153+
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
154+
imageTag: $(Build.BuildNumber)
155+
cni:
156+
name: cni
157+
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
158+
archiveName: azure-cni
159+
archiveVersion: $(CNI_VERSION)
160+
imageTag: $(Build.BuildNumber)
161+
packageWithDropGZ: True
162+
cns:
163+
name: cns
164+
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
165+
archiveName: azure-cns
166+
archiveVersion: $(CNS_VERSION)
167+
imageTag: $(Build.BuildNumber)
168+
ipv6_hp_bpf:
169+
name: ipv6-hp-bpf
170+
extraArgs: "--build-arg DEBUG=$(System.Debug)"
171+
archiveName: ipv6-hp-bpf
172+
archiveVersion: $(IPV6_HP_BPF_VERSION)
173+
imageTag: $(Build.BuildNumber)
174+
# npm:
175+
# name: npm
176+
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
177+
# archiveName: azure-npm
178+
# archiveVersion: $(NPM_VERSION)
179+
# imageTag: $(Build.BuildNumber)
182180

183181

182+
- ${{ if not(contains(variables['Build.SourceBranch'], 'refs/pull')) }}:
184183
- stage: manifests
185184
displayName: "Image Manifests"
186185
dependsOn:

‎.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)