Skip to content

Commit f373a56

Browse files
jpayne3506jpayne3506
authored
ci: Parameterize dropgz input for all Release pipeline scenarios (#2354)
* fix: parameterize dropgz input * ci: verbose output for cniv1
1 parent 743583b commit f373a56

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

‎.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,7 @@ stages:
8080
kubectl get po -owide -A
8181
8282
echo "Deploy Azure-CNS"
83-
if [ -z $(DROP_GZ_VERSION) ]; then
84-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
85-
else
86-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(DROP_GZ_VERSION) INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
87-
fi
83+
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
8884
kubectl get po -owide -A
8985
- job: deploy_pods
9086
condition: and( and( not(canceled()), not(failed()) ), or( contains(variables.CONTROL_SCENARIO, 'scaleTest') , contains(variables.CONTROL_SCENARIO, 'all') ) )

‎.pipelines/cni/pipeline.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,13 @@ stages:
1515
go version
1616
echo "##vso[task.setvariable variable=commitID;isOutput=true]$(echo $(make revision)-$(date "+%d%H%M"))"
1717
echo "##vso[task.setvariable variable=npmVersion;isOutput=true]$(make npm-version)"
18-
echo "##vso[task.setvariable variable=dropgzVersion;isOutput=true]$(make cni-dropgz-test-version)"
1918
echo "##vso[task.setvariable variable=cnsVersion;isOutput=true]$(CNS_VERSION)"
19+
20+
if [ -z $(DROP_GZ_VERSION) ]; then
21+
echo "##vso[task.setvariable variable=dropgzVersion;isOutput=true]$(make cni-dropgz-test-version)"
22+
else
23+
echo "##vso[task.setvariable variable=dropgzVersion;isOutput=true]$(DROP_GZ_VERSION)"
24+
fi
2025
name: "SetEnvVars"
2126
displayName: "Set Environment Variables"
2227
condition: always()

‎.pipelines/cni/singletenancy/cniv1-template.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,20 @@ stages:
108108
set -ex
109109
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
110110
echo "Upload CNI"
111+
echo "Deploying on Linux nodes"
111112
if [ "${{parameters.os}}" == "windows" ]; then
112-
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='linux' ARCH=${{ parameters.arch }} CNI_DROPGZ_VERSION=$(dropgzVersion))
113+
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='linux' ARCH=${{ parameters.arch }} CNI_DROPGZ_TEST_VERSION=$(dropgzVersion))
114+
echo "Dropgz image: $DROP_GZ_URL"
113115
envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
114116
kubectl rollout status daemonset/azure-cni -n kube-system
115117
echo "Deploying on windows nodes"
116-
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='windows' ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }} CNI_DROPGZ_VERSION=$(dropgzVersion))
118+
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='windows' ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }} CNI_DROPGZ_TEST_VERSION=$(dropgzVersion))
119+
echo "Dropgz image: $DROP_GZ_URL"
117120
envsubst < ./test/integration/manifests/cni/cni-installer-v1-windows.yaml | kubectl apply -f -
118121
kubectl rollout status daemonset/azure-cni-windows -n kube-system
119122
else
120-
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS=${{ parameters.os }} ARCH=${{ parameters.arch }} CNI_DROPGZ_VERSION=$(dropgzVersion))
123+
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS=${{ parameters.os }} ARCH=${{ parameters.arch }} CNI_DROPGZ_TEST_VERSION=$(dropgzVersion))
124+
echo "Dropgz image: $DROP_GZ_URL"
121125
envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
122126
kubectl rollout status daemonset/azure-cni -n kube-system
123127
fi

‎.pipelines/cni/singletenancy/linux-cniv2-template.yaml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,7 @@ stages:
106106
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
107107
kubectl cluster-info
108108
kubectl get po -owide -A
109-
if [ -z $(DROP_GZ_VERSION) ]; then
110-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
111-
else
112-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(DROP_GZ_VERSION) INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
113-
fi
109+
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
114110
name: "overlaye2e"
115111
displayName: "Overlay Integration"
116112
- ${{ if contains(parameters.clusterType, 'swift') }}:
@@ -125,11 +121,7 @@ stages:
125121
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
126122
kubectl cluster-info
127123
kubectl get po -owide -A
128-
if [ -z $(DROP_GZ_VERSION) ]; then
129-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZURE_VNET=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
130-
else
131-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(DROP_GZ_VERSION) INSTALL_CNS=true INSTALL_AZURE_VNET=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
132-
fi
124+
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZURE_VNET=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
133125
name: "swifte2e"
134126
displayName: "Swift Integration"
135127
- template: ../../npm/npm-cni-integration-test.yaml

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,20 @@ steps:
3030
set -e
3131
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
3232
echo "Upload CNI"
33+
echo "Deploying on Linux nodes"
3334
if [ "${{parameters.os}}" == "windows" ]; then
3435
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='linux' ARCH=${{ parameters.arch }} CNI_DROPGZ_VERSION=${{ parameters.version }})
36+
echo "Dropgz image: $DROP_GZ_URL"
3537
envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
3638
kubectl rollout status daemonset/azure-cni -n kube-system
3739
echo "Deploying on windows nodes"
3840
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='windows' ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }} CNI_DROPGZ_VERSION=${{ parameters.version }})
41+
echo "Dropgz image: $DROP_GZ_URL"
3942
envsubst < ./test/integration/manifests/cni/cni-installer-v1-windows.yaml | kubectl apply -f -
4043
kubectl rollout status daemonset/azure-cni-windows -n kube-system
4144
else
4245
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS=${{ parameters.os }} ARCH=${{ parameters.arch }} CNI_DROPGZ_VERSION=${{ parameters.version }})
46+
echo "Dropgz image: $DROP_GZ_URL"
4347
envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
4448
kubectl rollout status daemonset/azure-cni -n kube-system
4549
fi

0 commit comments

Comments
 (0)