Skip to content

Commit 0a3b08d

Browse files
sheylatrudosheylatrudo
committed
fixup! Update Variables to Generated Values
1 parent 117da18 commit 0a3b08d

16 files changed

+28
-122
lines changed

‎.pipelines/cni/cilium/cilium-scale-test.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ stages:
3838
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
3939
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
4040
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
41+
IPAM_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/azure-ipam
4142
CNS_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cns
4243
CNI_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cni
4344
IPV6_HP_BPF_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/ipv6-hp-bpf
@@ -89,7 +90,7 @@ stages:
8990
kubectl get po -owide -A
9091
9192
echo "Deploy Azure-CNS"
92-
sudo -E env "PATH=$PATH" make test-load AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_ONLY=true CNS_VERSION=$(CNS_VERSION) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) CNI_IMAGE_NAME_OVERRIDE=$(CNI_IMAGE_NAME_OVERRIDE)
93+
sudo -E env "PATH=$PATH" make test-load AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_ONLY=true CNI_VERSION=$(CNI_VERSION) CNS_VERSION=$(CNS_VERSION) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) CNI_IMAGE_NAME_OVERRIDE=$(CNI_IMAGE_NAME_OVERRIDE)
9394
kubectl get po -owide -A
9495
kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=10m || {
9596
echo "Not all pods ready"

‎.pipelines/singletenancy/aks-swift/aks-swift-e2e.steps.yaml‎

Lines changed: 0 additions & 104 deletions
This file was deleted.

‎.pipelines/singletenancy/aks/e2e-job-template.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ stages:
4545
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4646
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
4747

48+
AZURE_REGISTRY: acnpublic.azurecr.io
4849
IMAGE_REPO_PATH: '/artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
4950
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
5051
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]

‎.pipelines/singletenancy/aks/e2e-step-template.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,15 @@ steps:
3131
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
3232
echo "Upload CNI"
3333
echo "Deploying on Linux nodes"
34+
export CNI_IMAGE='"$AZURE_REGISTRY"/"$CNI_IMAGE_NAME_OVERRIDE":"$CNI_VERSION"'
35+
echo "CNI image: $CNI_IMAGE"
3436
if [ "${{parameters.os}}" == "windows" ]; then
35-
export CNI_IMAGE=acnpublic.azurecr.io$(IMAGE_REPO_PATH)/linux-amd64/cni:20250424.13
36-
echo "CNI image: $CNI_IMAGE"
3737
envsubst '${CNI_IMAGE}' < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
3838
kubectl rollout status daemonset/azure-cni -n kube-system
3939
echo "Deploying on windows nodes"
40-
export CNI_IMAGE=acnpublic.azurecr.io$(IMAGE_REPO_PATH)/windows-amd64/cni:20250424.13
41-
echo "CNI image: $CNI_IMAGE"
4240
envsubst '${CNI_IMAGE}' < ./test/integration/manifests/cni/cni-installer-v1-windows.yaml | kubectl apply -f -
4341
kubectl rollout status daemonset/azure-cni-windows -n kube-system
4442
else
45-
export CNI_IMAGE=acnpublic.azurecr.io$(IMAGE_REPO_PATH)/linux-amd64/cni:20250424.13
46-
echo "CNI image: $CNI_IMAGE"
4743
envsubst '${CNI_IMAGE}' < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
4844
kubectl rollout status daemonset/azure-cni -n kube-system
4945
fi

‎.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ stages:
5050
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
5151
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
5252
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
53+
IPAM_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/azure-ipam
5354
CNS_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cns
5455
CNI_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cni
5556
jobs:

‎.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ steps:
3939
SCALE_UP=32 OS_TYPE=linux CNI_TYPE=cniv2 VALIDATE_STATEFILE=true VALIDATE_V4OVERLAY=true \
4040
INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true CLEANUP=true \
4141
AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_VERSION=$(CNS_VERSION) CNI_VERSION=$(CNI_VERSION) \
42-
IPAM_IMAGE_NAME_OVERRIDE=$(IMAGE_REPO_PATH)/azure-ipam CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) CNI_IMAGE_NAME_OVERRIDE=$(CNI_IMAGE_NAME_OVERRIDE)
42+
IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) \
43+
CNI_IMAGE_NAME_OVERRIDE=$(CNI_IMAGE_NAME_OVERRIDE)
4344
retryCountOnTaskFailure: 2
4445
name: "integrationTest"
4546
displayName: "Run CNS Integration Tests on AKS Overlay"

‎.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ stages:
4949
NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
5050
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
5151
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
52+
IPAM_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/azure-ipam
5253
CNS_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cns
5354
CNI_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cni
5455
jobs:

‎.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ steps:
6060
sudo -E env "PATH=$PATH" make test-load \
6161
SCALE_UP=32 OS_TYPE=linux CNI_TYPE=cilium_dualstack VALIDATE_STATEFILE=true \
6262
INSTALL_CNS=true INSTALL_OVERLAY=true CLEANUP=true \
63-
AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_VERSION=$(CNS_VERSION) \
64-
CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) CNI_IMAGE_NAME_OVERRIDE=$(CNI_IMAGE_NAME_OVERRIDE)
63+
AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_VERSION=$(CNS_VERSION) CNI_VERSION=$(CNI_VERSION) \
64+
IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) \
65+
CNI_IMAGE_NAME_OVERRIDE=$(CNI_IMAGE_NAME_OVERRIDE)
6566
retryCountOnTaskFailure: 3
6667
name: "aziliumTest"
6768
displayName: "Run Azilium E2E on AKS Overlay"

‎.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ stages:
4848
NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
4949
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
5050
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
51+
IPAM_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/azure-ipam
5152
CNS_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cns
5253
CNI_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cni
5354
condition: and(succeeded(), eq(variables.TAG, variables.CURRENT_VERSION))

‎.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-step-template.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ steps:
7575
sudo -E env "PATH=$PATH" make test-load \
7676
SCALE_UP=32 OS_TYPE=linux VALIDATE_STATEFILE=true \
7777
INSTALL_CNS=true INSTALL_CNS_NODESUBNET=true CLEANUP=true \
78-
AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_VERSION=$(CNS_VERSION) \
79-
IPAM_IMAGE_NAME_OVERRIDE=$(IMAGE_REPO_PATH)/azure-ipam CNS_IMAGE_NAME_OVERRIDE=$(IMAGE_REPO_PATH)/cns
78+
AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_VERSION=$(CNS_VERSION) CNI_VERSION=$(CNI_VERSION) \
79+
IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) \
80+
CNI_IMAGE_NAME_OVERRIDE=$(CNI_IMAGE_NAME_OVERRIDE)
8081
retryCountOnTaskFailure: 3
8182
name: "nodeSubnetE2ETests"
8283
displayName: "Run NodeSubnet E2E"

0 commit comments

Comments
 (0)