Skip to content

Commit fe1247a

Browse files
author
Sheyla Trudo
committed
fixup! Template
1 parent d0747f8 commit fe1247a

File tree

4 files changed

+568
-73
lines changed

4 files changed

+568
-73
lines changed

.pipelines/containers/manifest-template.yaml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,7 @@ steps:
3737
displayName: Manifest Push
3838
retryCountOnTaskFailure: 3
3939
40-
- task: AzureCLI@2
41-
displayName: "Logout"
42-
inputs:
43-
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
44-
scriptLocation: "inlineScript"
45-
scriptType: "bash"
46-
inlineScript: |
47-
docker logout
48-
49-
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
50-
displayName: "Add SBOM Generator tool"
51-
inputs:
52-
BuildDropPath: "$(Build.ArtifactStagingDirectory)"
53-
54-
- task: PublishBuildArtifacts@1
40+
- task: 1ES.PublishPipelineArtifact@1
5541
inputs:
5642
artifactName: "output"
57-
pathtoPublish: "$(Build.ArtifactStagingDirectory)"
58-
condition: succeeded()
43+
targetPath: "$(Build.ArtifactStagingDirectory)"

.pipelines/pipeline.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
stages:
22
- stage: setup
3+
variables:
4+
ACN_DIR: $(Build.SourcesDirectory)
35
displayName: ACN
46
jobs:
57
- job: env
@@ -27,7 +29,6 @@ stages:
2729
echo $(Build.SourceBranch)
2830
name: "EnvironmentalVariables"
2931
displayName: "Set environmental variables"
30-
condition: always()
3132
3233
- template: templates/run-unit-tests.yaml
3334

@@ -37,6 +38,8 @@ stages:
3738
dependsOn:
3839
- setup
3940
- test
41+
variables:
42+
ACN_DIR: $(Build.SourcesDirectory)
4043
jobs:
4144
- job: build
4245
displayName: Build Binaries
@@ -45,6 +48,7 @@ stages:
4548
pool:
4649
name: "$(BUILD_POOL_NAME_DEFAULT)"
4750
steps:
51+
- checkout: self
4852
- script: |
4953
make ipv6-hp-bpf-lib
5054
make all-binaries-platforms
@@ -56,12 +60,15 @@ stages:
5660
dependsOn:
5761
- setup
5862
- test
63+
variables:
64+
ACN_DIR: $(Build.SourcesDirectory)
5965
jobs:
6066
- job: containerize_amd64
6167
displayName: Build Images
6268
pool:
6369
name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
6470
strategy:
71+
maxParallel: 4
6572
matrix:
6673
azure_ipam_linux_amd64:
6774
arch: amd64
@@ -129,6 +136,7 @@ stages:
129136
os: windows
130137
os_version: ltsc2022
131138
steps:
139+
- checkout: self
132140
- template: containers/container-template.yaml
133141
parameters:
134142
arch: $(arch)
@@ -140,6 +148,7 @@ stages:
140148
pool:
141149
name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
142150
strategy:
151+
maxParallel: 4
143152
matrix:
144153
azure_ipam_linux_arm64:
145154
arch: arm64
@@ -162,6 +171,7 @@ stages:
162171
name: npm
163172
os: linux
164173
steps:
174+
- checkout: self
165175
- template: containers/container-template.yaml
166176
parameters:
167177
arch: $(arch)
@@ -174,12 +184,14 @@ stages:
174184
- containerize
175185
variables:
176186
Packaging.EnableSBOMSigning: false
187+
ACN_DIR: $(Build.SourcesDirectory)
177188
jobs:
178189
- job: manifest
179190
displayName: Compile Manifests
180191
pool:
181192
name: "$(BUILD_POOL_NAME_DEFAULT)"
182193
strategy:
194+
maxParallel: 4
183195
matrix:
184196
azure_ipam:
185197
name: azure-ipam
@@ -378,6 +390,7 @@ stages:
378390
pool:
379391
name: "$(BUILD_POOL_NAME_DEFAULT)"
380392
strategy:
393+
maxParallel: 4
381394
matrix:
382395
cilium_e2e:
383396
name: cilium_e2e
@@ -437,6 +450,7 @@ stages:
437450
pool:
438451
name: "$(BUILD_POOL_NAME_DEFAULT)"
439452
strategy:
453+
maxParallel: 4
440454
matrix:
441455
swiftv2_e2e:
442456
name: swiftv2_e2e

0 commit comments

Comments
 (0)