Skip to content

Commit

Permalink
ci: Cleanup ACN PR pipeline yaml (#2861)
Browse files Browse the repository at this point in the history
ci: cleanup PR yaml
  • Loading branch information
jpayne3506 authored and paulyufan2 committed Jul 25, 2024
1 parent d4f73be commit 102b3df
Showing 1 changed file with 4 additions and 77 deletions.
81 changes: 4 additions & 77 deletions .pipelines/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,6 @@ stages:
os_version: $(os_version)
- job: containerize_linux_arm64
displayName: Build Images
variables:
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
pool:
name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
strategy:
Expand Down Expand Up @@ -310,46 +308,13 @@ stages:
arch: $(arch)
name: $(name)
os: $(os)
- job: check_tag
displayName: Check Tag
pool:
name: $(BUILD_POOL_NAME_DEFAULT)
steps:
- script: |
echo "##vso[task.setvariable variable=currentTagBuild;isOutput=true]$(make version)"
name: "CurrentTagBuild"
displayName: "Set current tag variable"
condition: always()
- stage: validate1
displayName: Validate Tags
dependsOn:
- setup
- containerize
variables:
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagBuild.currentTagBuild'] ]
condition: ne(variables.TAG, variables.CURRENT_VERSION)
jobs:
- job: timeout_and_cancel
displayName: Cancel Run
pool:
name: $(BUILD_POOL_NAME_DEFAULT)
steps:
- script: |
echo $TAG
echo $CURRENT_VERSION
echo "Checking if branch up to date with master"

- stage: publish
displayName: Publish Multiarch Manifests
dependsOn:
- containerize
variables:
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagBuild.currentTagBuild'] ]
Packaging.EnableSBOMSigning: false
condition: and(succeeded(), eq(variables.TAG, variables.CURRENT_VERSION))
jobs:
- job: manifest
displayName: Compile Manifests
Expand Down Expand Up @@ -386,17 +351,6 @@ stages:
name: $(name)
os_versions: $(os_versions)
platforms: $(platforms)
tag: $(TAG)
- job: check_tag
displayName: Check Tag
pool:
name: $(BUILD_POOL_NAME_DEFAULT)
steps:
- script: |
echo "##vso[task.setvariable variable=currentTagManifests;isOutput=true]$(make version)"
name: "CurrentTagManifests"
displayName: "Set current tag variable"
condition: always()

# Cilium Podsubnet E2E tests
- template: singletenancy/cilium/cilium-e2e-job-template.yaml
Expand Down Expand Up @@ -542,6 +496,7 @@ stages:
- aks_swift_e2e
- cilium_e2e
- cilium_overlay_e2e
- cilium_h_overlay_e2e
- aks_ubuntu_22_linux_e2e
- aks_swift_vnetscale_e2e
- aks_windows_22_e2e
Expand All @@ -563,6 +518,9 @@ stages:
cilium_overlay_e2e:
name: cilium_overlay_e2e
clusterName: "cilovere2e"
cilium_h_overlay_e2e:
name: cilium_h_overlay_e2e
clusterName: "cilwhleovere2e"
azure_overlay_e2e:
name: azure_overlay_e2e
clusterName: "azovere2e"
Expand All @@ -572,18 +530,6 @@ stages:
aks_swift_vnetscale_e2e:
name: aks_swift_vnetscale_e2e
clusterName: "vscaleswifte2e"
azure_overlay_cni_e2e:
name: "azure_overlay_cni_e2e"
clusterName: "azovercnie2e"
cilium_podsubnet_cni_e2e:
name: cilium_podsubnet_cni_e2e
clusterName: "cilpodcnie2e"
cilium_overlay_cni_e2e:
name: cilium_overlay_cni_e2e
clusterName: "cilovercnie2e"
aks_swift_cni_e2e:
name: aks_swift_cni_e2e
clusterName: "swiftcnie2e"
aks_ubuntu_22_linux_e2e:
name: aks_ubuntu_22_linux_e2e
clusterName: "ubuntu22e2e"
Expand All @@ -609,22 +555,3 @@ stages:
clusterName: $(clusterName)-$(commitID)
region: $(REGION_AKS_CLUSTER_TEST)

- stage: validate2
displayName: Validate Tags
dependsOn:
- setup
- publish
variables:
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
CURRENT_VERSION: $[ stagedependencies.publish.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
condition: ne(variables.TAG, variables.CURRENT_VERSION)
jobs:
- job: timeout_and_cancel
displayName: Cancel Run
pool:
name: $(BUILD_POOL_NAME_DEFAULT)
steps:
- script: |
echo $TAG
echo $CURRENT_VERSION
echo "Checking if branch is up to date with master"

0 comments on commit 102b3df

Please sign in to comment.