Skip to content

Commit 7bc9d7e

Browse files
rbtrrbtr
committed
chore: migrate to azure-cni from dropgz-test
Signed-off-by: Evan Baker <[email protected]>
1 parent 3362e36 commit 7bc9d7e

36 files changed

+154
-612
lines changed

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ parameters:
55
clusterName: "cilium-overlay"
66
nodeCount: 10
77
vmSize: "Standard_DS4_v2"
8-
testDropgz: true
98
os: "linux"
109
arch: ""
1110
osSKU: Ubuntu
@@ -42,7 +41,6 @@ stages:
4241
variables:
4342
commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
4443
cnsVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.cnsVersion'] ]
45-
dropgzVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.dropgzVersion'] ]
4644
pool:
4745
name: "$(BUILD_POOL_NAME_DEFAULT)"
4846
dependsOn:
@@ -80,7 +78,7 @@ stages:
8078
kubectl get po -owide -A
8179
8280
echo "Deploy Azure-CNS"
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)
81+
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
8482
kubectl get po -owide -A
8583
- job: deploy_pods
8684
condition: and( and( not(canceled()), not(failed()) ), or( contains(variables.CONTROL_SCENARIO, 'scaleTest') , contains(variables.CONTROL_SCENARIO, 'all') ) )

‎.pipelines/cni/cilium/nightly-release-test.yml

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ stages:
8686
- template: ../../singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
8787
parameters:
8888
name: "cilium_nightly"
89-
testDropgz: ""
9089
clusterName: ciliumnightly-$(commitID)
9190
testHubble: true
9291
- job: logs

‎.pipelines/cni/pipeline.yaml

+24-14
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ stages:
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)"
1818
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
2519
name: "SetEnvVars"
2620
displayName: "Set Environment Variables"
2721
condition: always()
@@ -36,13 +30,22 @@ stages:
3630
name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
3731
strategy:
3832
matrix:
39-
cni_dropgz_test_linux_amd64:
33+
azure_ipam_linux_amd64:
4034
arch: amd64
41-
name: cni-dropgz-test
35+
name: azure-ipam
4236
os: linux
43-
cni_dropgz_test_windows2022_amd64:
37+
azure_ipam_windows2022_amd64:
4438
arch: amd64
45-
name: cni-dropgz-test
39+
name: azure-ipam
40+
os: windows
41+
os_version: ltsc2022
42+
cni_linux_amd64:
43+
arch: amd64
44+
name: cni
45+
os: linux
46+
cni_windows2022_amd64:
47+
arch: amd64
48+
name: cni
4649
os: windows
4750
os_version: ltsc2022
4851
npm_linux_amd64:
@@ -67,9 +70,13 @@ stages:
6770
name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
6871
strategy:
6972
matrix:
70-
cni_dropgz_test_linux_arm64:
73+
azure_ipam_linux_arm64:
74+
arch: arm64
75+
name: azure-ipam
76+
os: linux
77+
cni_linux_arm64:
7178
arch: arm64
72-
name: cni-dropgz-test
79+
name: cni
7380
os: linux
7481
npm_linux_arm64:
7582
arch: arm64
@@ -125,8 +132,11 @@ stages:
125132
name: "$(BUILD_POOL_NAME_DEFAULT)"
126133
strategy:
127134
matrix:
128-
cni_dropgz_test:
129-
name: cni-dropgz-test
135+
azure-ipam:
136+
name: azure-ipam
137+
platforms: linux/amd64 linux/arm64 windows/amd64
138+
cni:
139+
name: cni
130140
platforms: linux/amd64 linux/arm64 windows/amd64
131141
npm:
132142
name: npm

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

+8-10
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ stages:
8787
variables:
8888
commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
8989
npmVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.npmVersion'] ]
90-
dropgzVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.dropgzVersion'] ]
9190
pool:
9291
name: $(BUILD_POOL_NAME_DEFAULT)
9392
dependsOn:
@@ -110,24 +109,24 @@ stages:
110109
echo "Upload CNI"
111110
echo "Deploying on Linux nodes"
112111
if [ "${{parameters.os}}" == "windows" ]; then
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"
112+
export CNI_IMAGE=$(make cni-image-name-and-tag OS='linux' ARCH=${{ parameters.arch }} CNI_VERSION=$(make cni-version))
113+
echo "CNI image: $CNI_IMAGE"
115114
envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
116115
kubectl rollout status daemonset/azure-cni -n kube-system
117116
echo "Deploying on windows nodes"
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"
117+
export CNI_IMAGE=$(make cni-image-name-and-tag OS='windows' ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }} CNI_VERSION=$(make cni-version))
118+
echo "CNI image: $CNI_IMAGE"
120119
envsubst < ./test/integration/manifests/cni/cni-installer-v1-windows.yaml | kubectl apply -f -
121120
kubectl rollout status daemonset/azure-cni-windows -n kube-system
122121
else
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"
122+
export CNI_IMAGE=$(make cni-image-name-and-tag OS=${{ parameters.os }} ARCH=${{ parameters.arch }} CNI_VERSION=$(make cni-version))
123+
echo "CNI image: $CNI_IMAGE"
125124
envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
126125
kubectl rollout status daemonset/azure-cni -n kube-system
127126
fi
128127
kubectl get pods -A -owide
129-
name: "UploadCNI"
130-
displayName: "Upload CNI"
128+
name: "deployCNI"
129+
displayName: "Deploy CNI"
131130
- template: ../../npm/npm-cni-integration-test.yaml
132131
parameters:
133132
clusterName: ${{ parameters.clusterName }}-$(commitID)
@@ -227,7 +226,6 @@ stages:
227226
variables:
228227
commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
229228
npmVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.npmVersion'] ]
230-
dropgzVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.dropgzVersion'] ]
231229
pool:
232230
name: $(BUILD_POOL_NAME_DEFAULT)
233231
dependsOn:

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ parameters:
77
vmSize: ""
88
os: linux
99
arch: ""
10-
testDropgz: true
1110
osSKU: Ubuntu
1211

1312
# CNIv2
@@ -80,7 +79,6 @@ stages:
8079
- stage: ${{ parameters.name }}
8180
variables:
8281
commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
83-
dropgzVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.dropgzVersion'] ]
8482
cnsVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.cnsVersion'] ]
8583
npmVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.npmVersion'] ]
8684
pool:
@@ -106,7 +104,7 @@ stages:
106104
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
107105
kubectl cluster-info
108106
kubectl get po -owide -A
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)
107+
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
110108
name: "overlaye2e"
111109
displayName: "Overlay Integration"
112110
- ${{ if contains(parameters.clusterType, 'swift') }}:
@@ -121,7 +119,7 @@ stages:
121119
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
122120
kubectl cluster-info
123121
kubectl get po -owide -A
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)
122+
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) INSTALL_CNS=true INSTALL_AZURE_VNET=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
125123
name: "swifte2e"
126124
displayName: "Swift Integration"
127125
- template: ../../npm/npm-cni-integration-test.yaml

0 commit comments

Comments
 (0)