Skip to content

Commit a82e39e

Browse files
authored
ci: [CNI] [NPM] Add NPM|CNI integration test to load-test pipeline. (#2105)
* ci: [CNI] [NPM] Add NPM|CNI integration test to load-test pipeline * Change artifact name * vmSize Increase * Addressing comments
1 parent f0d1413 commit a82e39e

File tree

4 files changed

+51
-6
lines changed

4 files changed

+51
-6
lines changed

.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
# sig-release provides test suite tarball(s) per k8s release. Just need to provide k8s version "v1.xx.xx"
2626
# pulling k8s version from AKS.
2727
eval k8sVersion="v"$( az aks show -g ${{ parameters.clusterName }}-$(make revision) -n ${{ parameters.clusterName }}-$(make revision) --query "currentKubernetesVersion")
28+
echo $k8sVersion
2829
curl -L https://dl.k8s.io/$k8sVersion/kubernetes-test-linux-amd64.tar.gz -o ./kubernetes-test-linux-amd64.tar.gz
2930
3031
# https://github.com/kubernetes/sig-release/blob/master/release-engineering/artifacts.md#content-of-kubernetes-test-system-archtargz-on-example-of-kubernetes-test-linux-amd64targz-directories-removed-from-list

.pipelines/cni/pipeline.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ stages:
1212
steps:
1313
- script: |
1414
echo "Setting up environment"
15+
echo "##vso[task.setvariable variable=npmVersion;isOutput=true]$(make npm-version)"
1516
go version
1617
name: "SetEnvVars"
1718
displayName: "Set Environment Variables"
@@ -30,7 +31,7 @@ stages:
3031
clusterType: "windows-cniv1-up"
3132
clusterName: "win-cniv1"
3233
nodeCount: 2
33-
vmSize: "Standard_B2s"
34+
vmSize: Standard_B2ms
3435
dependsOn: setup
3536
windowsVMSize: ${WINDOWS_VM_SKU}
3637
os: windows

.pipelines/cni/singletenancy/windows-cni-load-test-template.yaml

+44-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ stages:
3333
dependsOn: ${{ parameters.dependsOn }}
3434
displayName: "Build CNI Images"
3535
jobs:
36-
- job: build_cni_images
36+
- job: build_images
3737
pool:
3838
name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
3939
strategy:
@@ -43,17 +43,42 @@ stages:
4343
name: cni-dropgz-test
4444
os: windows
4545
os_version: ltsc2022
46+
npm_windows2022_amd64:
47+
arch: amd64
48+
name: npm
49+
os: windows
50+
os_version: ltsc2022
4651
steps:
4752
- template: ../../containers/container-template.yaml
4853
parameters:
4954
arch: $(arch)
5055
name: $(name)
5156
os: $(os)
5257
os_version: $(os_version)
58+
59+
- stage: binaries
60+
displayName: Build Binaries
61+
dependsOn: ${{ parameters.dependsOn }}
62+
jobs:
63+
- job:
64+
displayName: "Build Kubernetes Test Suite Binary"
65+
pool:
66+
name: $(BUILD_POOL_NAME_DEFAULT)
67+
steps:
68+
- bash: |
69+
git clone https://github.com/huntergregory/kubernetes.git --depth=1 --branch=linux-sleep-before-probing
70+
cd kubernetes
71+
export PATH=$PATH:/usr/local/go/bin/
72+
make WHAT=test/e2e/e2e.test
73+
displayName: "Build Kubernetes e2e.test"
74+
- publish: $(System.DefaultWorkingDirectory)/kubernetes/_output/local/bin/linux/amd64
75+
artifact: npm_k8s
76+
5377
- stage: update_cni
5478
dependsOn:
5579
- createAKSclusterWindows
5680
- build_images
81+
- binaries
5782
displayName: "Update CNI on Cluster"
5883
jobs:
5984
- job: deploy_pods
@@ -137,12 +162,29 @@ stages:
137162
clusterName: ${{ parameters.clusterName }}
138163
os: ${{ parameters.os }}
139164
cni: ${{ parameters.cni }}
165+
166+
- stage: npm
167+
dependsOn:
168+
- validate_state_windows
169+
- setup
170+
displayName: NPM|CNI Release Test
171+
variables:
172+
npmVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.npmVersion'] ]
173+
jobs:
174+
- template: ../../npm/npm-cni-integration-test.yaml
175+
parameters:
176+
clusterName: ${{ parameters.clusterName }}
177+
os: ${{ parameters.os }}
178+
sub: $(TEST_SUB_SERVICE_CONNECTION)
179+
os_version: 'ltsc2022'
180+
tag: $(npmVersion)
181+
140182
- stage: delete_resources
141183
pool:
142184
name: $(BUILD_POOL_NAME_DEFAULT)
143185
displayName: "Delete Resources"
144186
dependsOn:
145-
- validate_state_windows
187+
- npm
146188
jobs:
147189
- job: delete_resources
148190
pool:

.pipelines/npm/npm-cni-integration-test.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ parameters:
33
os: ""
44
sub: ""
55
os_version: ""
6+
dependsOn: ""
67
tag: ""
78

89
jobs:
@@ -54,7 +55,7 @@ jobs:
5455
echo "##vso[task.setvariable variable=FQDN]$FQDN"
5556
5657
- download: current
57-
artifact: Test
58+
artifact: npm_k8s
5859

5960
- bash: |
6061
# NetworkPolicy between server and...
@@ -74,10 +75,10 @@ jobs:
7475
client should stop enforcing policies after they are deleted|\
7576
client should support a 'default-deny-ingress' policy"
7677
77-
chmod +x $(Pipeline.Workspace)/Test/e2e.test
78+
chmod +x $(Pipeline.Workspace)/npm_k8s/e2e.test
7879
7980
KUBERNETES_SERVICE_HOST="$FQDN" KUBERNETES_SERVICE_PORT=443 \
80-
$(Pipeline.Workspace)/Test/e2e.test \
81+
$(Pipeline.Workspace)/npm_k8s/e2e.test \
8182
--provider=local \
8283
--ginkgo.focus="$focus" \
8384
--ginkgo.skip="NetworkPolicyLegacy|SCTP" \

0 commit comments

Comments
 (0)