Skip to content

Commit b64ee40

Browse files
committed
ci: Cleanup ACN PR pipeline yaml (#2861)
ci: cleanup PR yaml
1 parent bf00372 commit b64ee40

File tree

1 file changed

+4
-77
lines changed

1 file changed

+4
-77
lines changed

.pipelines/pipeline.yaml

Lines changed: 4 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ stages:
170170
os_version: $(os_version)
171171
- job: containerize_linux_arm64
172172
displayName: Build Images
173-
variables:
174-
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
175173
pool:
176174
name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
177175
strategy:
@@ -202,46 +200,13 @@ stages:
202200
arch: $(arch)
203201
name: $(name)
204202
os: $(os)
205-
- job: check_tag
206-
displayName: Check Tag
207-
pool:
208-
name: $(BUILD_POOL_NAME_DEFAULT)
209-
steps:
210-
- script: |
211-
echo "##vso[task.setvariable variable=currentTagBuild;isOutput=true]$(make version)"
212-
name: "CurrentTagBuild"
213-
displayName: "Set current tag variable"
214-
condition: always()
215-
216-
- stage: validate1
217-
displayName: Validate Tags
218-
dependsOn:
219-
- setup
220-
- containerize
221-
variables:
222-
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
223-
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagBuild.currentTagBuild'] ]
224-
condition: ne(variables.TAG, variables.CURRENT_VERSION)
225-
jobs:
226-
- job: timeout_and_cancel
227-
displayName: Cancel Run
228-
pool:
229-
name: $(BUILD_POOL_NAME_DEFAULT)
230-
steps:
231-
- script: |
232-
echo $TAG
233-
echo $CURRENT_VERSION
234-
echo "Checking if branch up to date with master"
235203

236204
- stage: publish
237205
displayName: Publish Multiarch Manifests
238206
dependsOn:
239207
- containerize
240208
variables:
241-
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
242-
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagBuild.currentTagBuild'] ]
243209
Packaging.EnableSBOMSigning: false
244-
condition: and(succeeded(), eq(variables.TAG, variables.CURRENT_VERSION))
245210
jobs:
246211
- job: manifest
247212
displayName: Compile Manifests
@@ -274,17 +239,6 @@ stages:
274239
name: $(name)
275240
os_versions: $(os_versions)
276241
platforms: $(platforms)
277-
tag: $(TAG)
278-
- job: check_tag
279-
displayName: Check Tag
280-
pool:
281-
name: $(BUILD_POOL_NAME_DEFAULT)
282-
steps:
283-
- script: |
284-
echo "##vso[task.setvariable variable=currentTagManifests;isOutput=true]$(make version)"
285-
name: "CurrentTagManifests"
286-
displayName: "Set current tag variable"
287-
condition: always()
288242

289243
# Cilium Podsubnet E2E tests
290244
- template: singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -430,6 +384,7 @@ stages:
430384
- aks_swift_e2e
431385
- cilium_e2e
432386
- cilium_overlay_e2e
387+
- cilium_h_overlay_e2e
433388
- aks_ubuntu_22_linux_e2e
434389
- aks_swift_vnetscale_e2e
435390
- aks_windows_22_e2e
@@ -451,6 +406,9 @@ stages:
451406
cilium_overlay_e2e:
452407
name: cilium_overlay_e2e
453408
clusterName: "cilovere2e"
409+
cilium_h_overlay_e2e:
410+
name: cilium_h_overlay_e2e
411+
clusterName: "cilwhleovere2e"
454412
azure_overlay_e2e:
455413
name: azure_overlay_e2e
456414
clusterName: "azovere2e"
@@ -460,18 +418,6 @@ stages:
460418
aks_swift_vnetscale_e2e:
461419
name: aks_swift_vnetscale_e2e
462420
clusterName: "vscaleswifte2e"
463-
azure_overlay_cni_e2e:
464-
name: "azure_overlay_cni_e2e"
465-
clusterName: "azovercnie2e"
466-
cilium_podsubnet_cni_e2e:
467-
name: cilium_podsubnet_cni_e2e
468-
clusterName: "cilpodcnie2e"
469-
cilium_overlay_cni_e2e:
470-
name: cilium_overlay_cni_e2e
471-
clusterName: "cilovercnie2e"
472-
aks_swift_cni_e2e:
473-
name: aks_swift_cni_e2e
474-
clusterName: "swiftcnie2e"
475421
aks_ubuntu_22_linux_e2e:
476422
name: aks_ubuntu_22_linux_e2e
477423
clusterName: "ubuntu22e2e"
@@ -497,22 +443,3 @@ stages:
497443
clusterName: $(clusterName)-$(commitID)
498444
region: $(REGION_AKS_CLUSTER_TEST)
499445

500-
- stage: validate2
501-
displayName: Validate Tags
502-
dependsOn:
503-
- setup
504-
- publish
505-
variables:
506-
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
507-
CURRENT_VERSION: $[ stagedependencies.publish.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
508-
condition: ne(variables.TAG, variables.CURRENT_VERSION)
509-
jobs:
510-
- job: timeout_and_cancel
511-
displayName: Cancel Run
512-
pool:
513-
name: $(BUILD_POOL_NAME_DEFAULT)
514-
steps:
515-
- script: |
516-
echo $TAG
517-
echo $CURRENT_VERSION
518-
echo "Checking if branch is up to date with master"

0 commit comments

Comments
 (0)