Skip to content

Commit d814424

Browse files
authored
ci: Cleanup ACN PR pipeline yaml (#2861)
ci: cleanup PR yaml
1 parent 469afea commit d814424

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
@@ -272,8 +272,6 @@ stages:
272272
os_version: $(os_version)
273273
- job: containerize_linux_arm64
274274
displayName: Build Images
275-
variables:
276-
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
277275
pool:
278276
name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
279277
strategy:
@@ -308,46 +306,13 @@ stages:
308306
arch: $(arch)
309307
name: $(name)
310308
os: $(os)
311-
- job: check_tag
312-
displayName: Check Tag
313-
pool:
314-
name: $(BUILD_POOL_NAME_DEFAULT)
315-
steps:
316-
- script: |
317-
echo "##vso[task.setvariable variable=currentTagBuild;isOutput=true]$(make version)"
318-
name: "CurrentTagBuild"
319-
displayName: "Set current tag variable"
320-
condition: always()
321-
322-
- stage: validate1
323-
displayName: Validate Tags
324-
dependsOn:
325-
- setup
326-
- containerize
327-
variables:
328-
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
329-
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagBuild.currentTagBuild'] ]
330-
condition: ne(variables.TAG, variables.CURRENT_VERSION)
331-
jobs:
332-
- job: timeout_and_cancel
333-
displayName: Cancel Run
334-
pool:
335-
name: $(BUILD_POOL_NAME_DEFAULT)
336-
steps:
337-
- script: |
338-
echo $TAG
339-
echo $CURRENT_VERSION
340-
echo "Checking if branch up to date with master"
341309

342310
- stage: publish
343311
displayName: Publish Multiarch Manifests
344312
dependsOn:
345313
- containerize
346314
variables:
347-
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
348-
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagBuild.currentTagBuild'] ]
349315
Packaging.EnableSBOMSigning: false
350-
condition: and(succeeded(), eq(variables.TAG, variables.CURRENT_VERSION))
351316
jobs:
352317
- job: manifest
353318
displayName: Compile Manifests
@@ -384,17 +349,6 @@ stages:
384349
name: $(name)
385350
os_versions: $(os_versions)
386351
platforms: $(platforms)
387-
tag: $(TAG)
388-
- job: check_tag
389-
displayName: Check Tag
390-
pool:
391-
name: $(BUILD_POOL_NAME_DEFAULT)
392-
steps:
393-
- script: |
394-
echo "##vso[task.setvariable variable=currentTagManifests;isOutput=true]$(make version)"
395-
name: "CurrentTagManifests"
396-
displayName: "Set current tag variable"
397-
condition: always()
398352

399353
# Cilium Podsubnet E2E tests
400354
- template: singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -540,6 +494,7 @@ stages:
540494
- aks_swift_e2e
541495
- cilium_e2e
542496
- cilium_overlay_e2e
497+
- cilium_h_overlay_e2e
543498
- aks_ubuntu_22_linux_e2e
544499
- aks_swift_vnetscale_e2e
545500
- aks_windows_22_e2e
@@ -561,6 +516,9 @@ stages:
561516
cilium_overlay_e2e:
562517
name: cilium_overlay_e2e
563518
clusterName: "cilovere2e"
519+
cilium_h_overlay_e2e:
520+
name: cilium_h_overlay_e2e
521+
clusterName: "cilwhleovere2e"
564522
azure_overlay_e2e:
565523
name: azure_overlay_e2e
566524
clusterName: "azovere2e"
@@ -570,18 +528,6 @@ stages:
570528
aks_swift_vnetscale_e2e:
571529
name: aks_swift_vnetscale_e2e
572530
clusterName: "vscaleswifte2e"
573-
azure_overlay_cni_e2e:
574-
name: "azure_overlay_cni_e2e"
575-
clusterName: "azovercnie2e"
576-
cilium_podsubnet_cni_e2e:
577-
name: cilium_podsubnet_cni_e2e
578-
clusterName: "cilpodcnie2e"
579-
cilium_overlay_cni_e2e:
580-
name: cilium_overlay_cni_e2e
581-
clusterName: "cilovercnie2e"
582-
aks_swift_cni_e2e:
583-
name: aks_swift_cni_e2e
584-
clusterName: "swiftcnie2e"
585531
aks_ubuntu_22_linux_e2e:
586532
name: aks_ubuntu_22_linux_e2e
587533
clusterName: "ubuntu22e2e"
@@ -607,22 +553,3 @@ stages:
607553
clusterName: $(clusterName)-$(commitID)
608554
region: $(REGION_AKS_CLUSTER_TEST)
609555

610-
- stage: validate2
611-
displayName: Validate Tags
612-
dependsOn:
613-
- setup
614-
- publish
615-
variables:
616-
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
617-
CURRENT_VERSION: $[ stagedependencies.publish.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
618-
condition: ne(variables.TAG, variables.CURRENT_VERSION)
619-
jobs:
620-
- job: timeout_and_cancel
621-
displayName: Cancel Run
622-
pool:
623-
name: $(BUILD_POOL_NAME_DEFAULT)
624-
steps:
625-
- script: |
626-
echo $TAG
627-
echo $CURRENT_VERSION
628-
echo "Checking if branch is up to date with master"

0 commit comments

Comments
 (0)