Skip to content

Commit 965e9ef

Browse files
Poorna-Gottimukkula1Poorna-Gottimukkula1
committed
Remove duplicate commands and env variables
Signed-off-by: Poorna Gottimukkula <Poorna.Gottimukkula1@ibm.com>
1 parent 2e00a78 commit 965e9ef

File tree

1 file changed

+31
-112
lines changed

1 file changed

+31
-112
lines changed

‎config/jobs/kubernetes/cloud-provider-ibmcloud/cloud-provider-ibmcloud-periodics.yaml

Lines changed: 31 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -77,40 +77,27 @@ periodics:
7777
- -c
7878
- |
7979
set -o errexit
80-
set -o nounset
81-
set -o pipefail
82-
set -o xtrace
8380
84-
RESOURCE_TYPE="powervs"
8581
#Call to boskos to checkout resource
8682
source "./hack/boskos.sh"
8783
8884
#Setup of kubetest2 tf deployer and ginkgo tester
8985
make install-deployer-tf
9086
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
9187
92-
#Install ansible required to bring up k8s cluster on infra
93-
apt-get update && apt-get install -y ansible
94-
95-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/k8s-release-dev/ci/latest.txt)
96-
9788
TIMESTAMP=$(date +%s)
9889
9990
set +o errexit
10091
set -o xtrace
101-
kubetest2 tf --powervs-image-name CentOS-Stream-9 \
92+
kubetest2 tf --powervs-image-name CentOS-Stream-9 --powervs-memory 32 \
10293
--powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
103-
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
104-
--powervs-ssh-key k8s-prow-sshkey \
94+
--powervs-service-id ${BOSKOS_RESOURCE_ID} --powervs-ssh-key k8s-prow-sshkey \
10595
--ssh-private-key /etc/secret-volume/ssh-privatekey \
106-
--build-version $K8S_BUILD_VERSION \
107-
--release-marker $K8S_BUILD_VERSION \
108-
--cluster-name config1-$TIMESTAMP \
109-
--workers-count 2 \
96+
--workers-count 2 --cluster-name config1-$TIMESTAMP \
11097
--up --auto-approve --retry-on-tf-failure 3 \
11198
--break-kubetest-on-upfail true \
112-
--powervs-memory 32 \
113-
--test=ginkgo -- --parallel 10 --test-package-dir ci --test-package-version $K8S_BUILD_VERSION --focus-regex='\[Conformance\]' --skip-regex='\[Serial\]'; rc1=$?
99+
--build-version $(curl -Ls https://dl.k8s.io/ci/latest.txt) \
100+
--test=ginkgo -- --parallel 10 --test-package-dir ci --test-package-marker latest.txt --focus-regex='\[Conformance\]' --skip-regex='\[Serial\]'; rc1=$?
114101
115102
export KUBECONFIG="$(pwd)/config1-$TIMESTAMP/kubeconfig"
116103
export ARTIFACTS=$ARTIFACTS/serial_tests_artifacts
@@ -120,9 +107,7 @@ periodics:
120107
--ignore-cluster-dir true \
121108
--cluster-name config1-$TIMESTAMP \
122109
--down --auto-approve --ignore-destroy-errors \
123-
--test=ginkgo -- \
124-
--test-package-dir ci \
125-
--test-package-version $K8S_BUILD_VERSION --focus-regex='\[Serial\].*\[Conformance\]'; rc2=$?
110+
--test=ginkgo -- --test-package-dir ci --test-package-marker latest.txt --focus-regex='\[Serial\].*\[Conformance\]'; rc2=$?
126111
127112
[ -z "${BOSKOS_HOST:-}" ] || release_account >> "$ARTIFACTS/boskos.log" 2>&1
128113
@@ -172,36 +157,31 @@ periodics:
172157
- -c
173158
- |
174159
set -o errexit
175-
set -o nounset
176-
set -o pipefail
177-
set -o xtrace
178160
179-
RESOURCE_TYPE="powervs"
180161
source "./hack/boskos.sh"
181162
182163
make install-deployer-tf
183164
184-
apt-get update && apt-get install -y ansible
185-
186165
TIMESTAMP=$(date +%s)
187-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/k8s-release-dev/ci/latest.txt)
188166
189167
set +o errexit
190-
kubetest2 tf --powervs-image-name CentOS-Stream-9 \
168+
kubetest2 tf --powervs-image-name CentOS-Stream-9 --powervs-memory 32 \
191169
--powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
192-
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
193-
--powervs-ssh-key k8s-prow-sshkey \
170+
--powervs-service-id ${BOSKOS_RESOURCE_ID} --powervs-ssh-key k8s-prow-sshkey \
194171
--ssh-private-key /etc/secret-volume/ssh-privatekey \
195172
--cluster-name config2-$TIMESTAMP \
196-
--up --set-kubeconfig=false --auto-approve \
197-
--build-version $K8S_BUILD_VERSION --retry-on-tf-failure 3 \
198-
--break-kubetest-on-upfail true --powervs-memory 32 \
173+
--up --set-kubeconfig=false --auto-approve --retry-on-tf-failure 3 \
174+
--build-version $(curl -Ls https://dl.k8s.io/ci/latest.txt) \
175+
--break-kubetest-on-upfail true \
199176
--playbook k8s-node-remote.yml
177+
200178
EXTERNAL_IP=`grep -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' $(pwd)/config2-$TIMESTAMP/hosts`
179+
201180
# Skipping test related to https://github.com/kubernetes/kubernetes/issues/124791
202181
kubetest2 tf --test=exec -- ssh -i /etc/secret-volume/ssh-privatekey root@$EXTERNAL_IP \
203182
"export SKIP='\[Flaky\]|\[Slow\]|\[Serial\]|should.execute.readiness.probe.while.in.preStop' && /make-test-e2e-node.sh"; \
204183
rc=$?; scp -r -i /etc/secret-volume/ssh-privatekey root@$EXTERNAL_IP:/tmp/_artifacts $ARTIFACTS
184+
205185
kubetest2 tf --powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
206186
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
207187
--ignore-cluster-dir true \
@@ -250,41 +230,26 @@ periodics:
250230
- -c
251231
- |
252232
set -o errexit
253-
set -o nounset
254-
set -o pipefail
255-
set -o xtrace
256233
257-
RESOURCE_TYPE="powervs"
258234
#Call to boskos to checkout resource
259235
source "./hack/boskos.sh"
260236
261237
#Setup of kubetest2 tf deployer and ginkgo tester
262238
make install-deployer-tf
263239
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
264240
265-
#Install ansible required to bring up k8s cluster on infra
266-
apt-get update && apt-get install -y ansible
267-
268-
K8S_BUILD_VERSION=$(curl -Ls https://dl.k8s.io/ci/latest.txt)
269-
270-
TIMESTAMP=$(date +%s)
271-
272241
set +o errexit
273242
set -o xtrace
274-
kubetest2 tf --powervs-image-name CentOS-Stream-9 \
243+
kubetest2 tf --powervs-image-name CentOS-Stream-9 --powervs-memory 32 \
275244
--powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
276-
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
277-
--powervs-ssh-key k8s-prow-sshkey \
245+
--powervs-service-id ${BOSKOS_RESOURCE_ID} --powervs-ssh-key k8s-prow-sshkey \
278246
--ssh-private-key /etc/secret-volume/ssh-privatekey \
279-
--build-version $K8S_BUILD_VERSION \
280-
--release-marker $K8S_BUILD_VERSION \
281-
--cluster-name alpha-enabled-$TIMESTAMP \
282-
--workers-count 2 \
247+
--workers-count 2 --cluster-name alpha-enabled-$(date +%s) \
283248
--up --down --auto-approve --retry-on-tf-failure 3 \
284249
--break-kubetest-on-upfail true \
285250
--extra-vars=feature_gates:AllAlpha=true,EventedPLEG=false \
286251
--extra-vars=runtime_config:api/all=true \
287-
--powervs-memory 32 \
252+
--build-version $(curl -Ls https://dl.k8s.io/ci/latest.txt) \
288253
--test=ginkgo -- --parallel 25 --test-package-dir ci --test-package-marker latest.txt \
289254
--skip-regex="\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|KubeProxy.should.update.metric"; rc=$?
290255
@@ -329,39 +294,24 @@ periodics:
329294
- -c
330295
- |
331296
set -o errexit
332-
set -o nounset
333-
set -o pipefail
334-
set -o xtrace
335297
336-
RESOURCE_TYPE="powervs"
337298
#Call to boskos to checkout resource
338299
source "./hack/boskos.sh"
339300
340301
#Setup of kubetest2 tf deployer and ginkgo tester
341302
make install-deployer-tf
342303
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
343304
344-
#Install ansible required to bring up k8s cluster on infra
345-
apt-get update && apt-get install -y ansible
346-
347-
K8S_BUILD_VERSION=$(curl -Ls https://dl.k8s.io/ci/latest.txt)
348-
349-
TIMESTAMP=$(date +%s)
350-
351305
set +o errexit
352306
set -o xtrace
353-
kubetest2 tf --powervs-image-name CentOS-Stream-9 \
307+
kubetest2 tf --powervs-image-name CentOS-Stream-9 --powervs-memory 32 \
354308
--powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
355-
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
356-
--powervs-ssh-key k8s-prow-sshkey \
309+
--powervs-service-id ${BOSKOS_RESOURCE_ID} --powervs-ssh-key k8s-prow-sshkey \
357310
--ssh-private-key /etc/secret-volume/ssh-privatekey \
358-
--build-version $K8S_BUILD_VERSION \
359-
--release-marker $K8S_BUILD_VERSION \
360-
--cluster-name e2e-default-$TIMESTAMP \
361-
--workers-count 2 \
311+
--workers-count 2 --cluster-name e2e-default-$(date +%s) \
362312
--up --down --auto-approve --retry-on-tf-failure 3 \
363313
--break-kubetest-on-upfail true \
364-
--powervs-memory 32 \
314+
--build-version $(curl -Ls https://dl.k8s.io/ci/latest.txt) \
365315
--test=ginkgo -- --parallel 25 --test-package-dir ci --test-package-marker latest.txt \
366316
--skip-regex="\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|KubeProxy.should.update.metric"; rc=$?
367317
@@ -408,40 +358,25 @@ periodics:
408358
- -c
409359
- |
410360
set -o errexit
411-
set -o nounset
412-
set -o pipefail
413-
set -o xtrace
414361
415-
RESOURCE_TYPE="powervs"
416362
#Call to boskos to checkout resource
417363
source "./hack/boskos.sh"
418364
419365
#Setup of kubetest2 tf deployer and ginkgo tester
420366
make install-deployer-tf
421367
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
422368
423-
#Install ansible required to bring up k8s cluster on infra
424-
apt-get update && apt-get install -y ansible
425-
426-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/k8s-release-dev/ci/latest.txt)
427-
428-
TIMESTAMP=$(date +%s)
429-
430369
set +o errexit
431370
set -o xtrace
432-
kubetest2 tf --powervs-image-name CentOS-Stream-9 \
371+
kubetest2 tf --powervs-image-name CentOS-Stream-9 --powervs-memory 32 \
433372
--powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
434-
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
435-
--powervs-ssh-key k8s-prow-sshkey \
373+
--powervs-service-id ${BOSKOS_RESOURCE_ID} --powervs-ssh-key k8s-prow-sshkey \
436374
--ssh-private-key /etc/secret-volume/ssh-privatekey \
437-
--build-version $K8S_BUILD_VERSION \
438-
--release-marker $K8S_BUILD_VERSION \
439-
--cluster-name e2e-slow-$TIMESTAMP \
440-
--workers-count 2 \
375+
--workers-count 2 --cluster-name e2e-slow-$(date +%s) \
441376
--up --down --auto-approve --retry-on-tf-failure 3 \
442377
--break-kubetest-on-upfail true \
443-
--powervs-memory 32 \
444-
--test=ginkgo -- --parallel 30 --test-package-dir ci --test-package-version $K8S_BUILD_VERSION --focus-regex='\[Slow\]' --skip-regex='\[Driver:.gcepd\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:' ; rc=$?
378+
--build-version $(curl -Ls https://dl.k8s.io/ci/latest.txt) \
379+
--test=ginkgo -- --parallel 30 --test-package-dir ci --test-package-marker latest.txt --focus-regex='\[Slow\]' --skip-regex='\[Driver:.gcepd\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:' ; rc=$?
445380
446381
[ -z "${BOSKOS_HOST:-}" ] || release_account >> "$ARTIFACTS/boskos.log" 2>&1
447382
[ $rc != 0 ] && echo "ERROR: E2e Slow tests exited with code: $rc"; exit $rc
@@ -484,11 +419,6 @@ periodics:
484419
- -c
485420
- |
486421
set -o errexit
487-
set -o nounset
488-
set -o pipefail
489-
set -o xtrace
490-
491-
RESOURCE_TYPE="powervs"
492422
493423
#Call to boskos to checkout resource
494424
source "./hack/boskos.sh"
@@ -497,28 +427,17 @@ periodics:
497427
make install-deployer-tf
498428
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
499429
500-
#Install ansible required to bring up k8s cluster on infra
501-
apt-get update && apt-get install -y ansible
502-
503-
K8S_BUILD_VERSION=$(curl -Ls https://dl.k8s.io/ci/latest.txt)
504-
505-
TIMESTAMP=$(date +%s)
506-
507430
set +o errexit
508431
set -o xtrace
509-
kubetest2 tf --powervs-image-name CentOS-Stream-9 \
432+
kubetest2 tf --powervs-image-name CentOS-Stream-9 --powervs-memory 32 \
510433
--powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
511-
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
512-
--powervs-ssh-key k8s-prow-sshkey \
434+
--powervs-service-id ${BOSKOS_RESOURCE_ID} --powervs-ssh-key k8s-prow-sshkey \
513435
--ssh-private-key /etc/secret-volume/ssh-privatekey \
514-
--build-version $K8S_BUILD_VERSION \
515-
--release-marker $K8S_BUILD_VERSION \
516-
--cluster-name e2e-serial-$TIMESTAMP \
517-
--workers-count 2 \
436+
--workers-count 2 --cluster-name e2e-serial-$(date +%s) \
518437
--up --down --auto-approve --retry-on-tf-failure 3 \
519438
--break-kubetest-on-upfail true \
520-
--powervs-memory 32 \
521439
--extra-vars=container_runtime_test_handler:true \
440+
--build-version $(curl -Ls https://dl.k8s.io/ci/latest.txt) \
522441
--test=ginkgo -- --parallel 1 --test-package-dir ci --test-package-marker latest.txt \
523442
--focus-regex='\[Serial\]|\[Disruptive\]' --skip-regex='\[Driver:.gcepd\]|\[Flaky\]|\[Feature:.+\]|\[sig-cloud-provider-gcp\]'; rc=$?
524443

0 commit comments

Comments
 (0)