Skip to content

Commit a0bebca

Browse files
Poorna-Gottimukkula1Poorna-Gottimukkula1
committed
Remove duplicate commands and env variables
Signed-off-by: Poorna Gottimukkula <[email protected]>
1 parent 1f158e4 commit a0bebca

File tree

1 file changed

+42
-127
lines changed

1 file changed

+42
-127
lines changed

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

Lines changed: 42 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -76,53 +76,38 @@ periodics:
7676
- bash
7777
- -c
7878
- |
79-
set -o errexit
80-
set -o nounset
81-
set -o pipefail
8279
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-
97-
TIMESTAMP=$(date +%s)
88+
CLUSTER_NAME="config1-$(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 $CLUSTER_NAME \
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
115-
export KUBECONFIG="$(pwd)/config1-$TIMESTAMP/kubeconfig"
102+
export KUBECONFIG="$(pwd)/$CLUSTER_NAME/kubeconfig"
116103
export ARTIFACTS=$ARTIFACTS/serial_tests_artifacts
117104
#Run Serial Conformance tests
118105
kubetest2 tf --powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
119106
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
120107
--ignore-cluster-dir true \
121-
--cluster-name config1-$TIMESTAMP \
108+
--cluster-name $CLUSTER_NAME \
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
@@ -171,41 +156,36 @@ periodics:
171156
- bash
172157
- -c
173158
- |
174-
set -o errexit
175-
set -o nounset
176-
set -o pipefail
177159
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-
186-
TIMESTAMP=$(date +%s)
187-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/k8s-release-dev/ci/latest.txt)
165+
CLUSTER_NAME="config2-$(date +%s)"
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 \
195-
--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 \
172+
--cluster-name $CLUSTER_NAME \
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
200-
EXTERNAL_IP=`grep -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' $(pwd)/config2-$TIMESTAMP/hosts`
177+
178+
EXTERNAL_IP=`grep -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' $(pwd)/$CLUSTER_NAME/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 \
208-
--cluster-name config2-$TIMESTAMP \
188+
--cluster-name $CLUSTER_NAME\
209189
--down --auto-approve --ignore-destroy-errors
210190
[ -z "${BOSKOS_HOST:-}" ] || release_account >> "$ARTIFACTS/boskos.log" 2>&1
211191
[ $rc != 0 ] && echo "ERROR: E2ENode Test suite exited with code:$rc"; exit $rc
@@ -249,43 +229,27 @@ periodics:
249229
- bash
250230
- -c
251231
- |
252-
set -o errexit
253-
set -o nounset
254-
set -o pipefail
255232
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 \
283-
--up --down --auto-approve --ignore-destroy-errors \
284-
--retry-on-tf-failure 3 \
247+
--workers-count 2 --cluster-name alpha-enabled-$(date +%s) \
248+
--up --down --auto-approve --retry-on-tf-failure 3 --ignore-destroy-errors \
285249
--break-kubetest-on-upfail true \
286250
--extra-vars=feature_gates:AllAlpha=true,EventedPLEG=false \
287251
--extra-vars=runtime_config:api/all=true \
288-
--powervs-memory 32 \
252+
--build-version $(curl -Ls https://dl.k8s.io/ci/latest.txt) \
289253
--test=ginkgo -- --parallel 25 --test-package-dir ci --test-package-marker latest.txt \
290254
--skip-regex="\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|KubeProxy.should.update.metric"; rc=$?
291255
@@ -329,41 +293,25 @@ periodics:
329293
- bash
330294
- -c
331295
- |
332-
set -o errexit
333-
set -o nounset
334-
set -o pipefail
335296
set -o xtrace
336297
337-
RESOURCE_TYPE="powervs"
338298
#Call to boskos to checkout resource
339299
source "./hack/boskos.sh"
340300
341301
#Setup of kubetest2 tf deployer and ginkgo tester
342302
make install-deployer-tf
343303
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
344304
345-
#Install ansible required to bring up k8s cluster on infra
346-
apt-get update && apt-get install -y ansible
347-
348-
K8S_BUILD_VERSION=$(curl -Ls https://dl.k8s.io/ci/latest.txt)
349-
350-
TIMESTAMP=$(date +%s)
351-
352305
set +o errexit
353306
set -o xtrace
354-
kubetest2 tf --powervs-image-name CentOS-Stream-9 \
307+
kubetest2 tf --powervs-image-name CentOS-Stream-9 --powervs-memory 32 \
355308
--powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
356-
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
357-
--powervs-ssh-key k8s-prow-sshkey \
309+
--powervs-service-id ${BOSKOS_RESOURCE_ID} --powervs-ssh-key k8s-prow-sshkey \
358310
--ssh-private-key /etc/secret-volume/ssh-privatekey \
359-
--build-version $K8S_BUILD_VERSION \
360-
--release-marker $K8S_BUILD_VERSION \
361-
--cluster-name e2e-default-$TIMESTAMP \
362-
--workers-count 2 \
363-
--up --down --auto-approve --ignore-destroy-errors \
364-
--retry-on-tf-failure 3 \
311+
--workers-count 2 --cluster-name e2e-default-$(date +%s) \
312+
--up --down --auto-approve --retry-on-tf-failure 3 --ignore-destroy-errors \
365313
--break-kubetest-on-upfail true \
366-
--powervs-memory 32 \
314+
--build-version $(curl -Ls https://dl.k8s.io/ci/latest.txt) \
367315
--test=ginkgo -- --parallel 25 --test-package-dir ci --test-package-marker latest.txt \
368316
--skip-regex="\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|KubeProxy.should.update.metric"; rc=$?
369317
@@ -409,42 +357,26 @@ periodics:
409357
- bash
410358
- -c
411359
- |
412-
set -o errexit
413-
set -o nounset
414-
set -o pipefail
415360
set -o xtrace
416361
417-
RESOURCE_TYPE="powervs"
418362
#Call to boskos to checkout resource
419363
source "./hack/boskos.sh"
420364
421365
#Setup of kubetest2 tf deployer and ginkgo tester
422366
make install-deployer-tf
423367
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
424368
425-
#Install ansible required to bring up k8s cluster on infra
426-
apt-get update && apt-get install -y ansible
427-
428-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/k8s-release-dev/ci/latest.txt)
429-
430-
TIMESTAMP=$(date +%s)
431-
432369
set +o errexit
433370
set -o xtrace
434-
kubetest2 tf --powervs-image-name CentOS-Stream-9 \
371+
kubetest2 tf --powervs-image-name CentOS-Stream-9 --powervs-memory 32 \
435372
--powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
436-
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
437-
--powervs-ssh-key k8s-prow-sshkey \
373+
--powervs-service-id ${BOSKOS_RESOURCE_ID} --powervs-ssh-key k8s-prow-sshkey \
438374
--ssh-private-key /etc/secret-volume/ssh-privatekey \
439-
--build-version $K8S_BUILD_VERSION \
440-
--release-marker $K8S_BUILD_VERSION \
441-
--cluster-name e2e-slow-$TIMESTAMP \
442-
--workers-count 2 \
443-
--up --down --auto-approve --ignore-destroy-errors \
444-
--retry-on-tf-failure 3 \
375+
--workers-count 2 --cluster-name e2e-slow-$(date +%s) \
376+
--up --down --auto-approve --retry-on-tf-failure 3 --ignore-destroy-errors\
445377
--break-kubetest-on-upfail true \
446-
--powervs-memory 32 \
447-
--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=$?
448380
449381
[ -z "${BOSKOS_HOST:-}" ] || release_account >> "$ARTIFACTS/boskos.log" 2>&1
450382
[ $rc != 0 ] && echo "ERROR: E2e Slow tests exited with code: $rc"; exit $rc
@@ -486,43 +418,26 @@ periodics:
486418
- bash
487419
- -c
488420
- |
489-
set -o errexit
490-
set -o nounset
491-
set -o pipefail
492421
set -o xtrace
493422
494-
RESOURCE_TYPE="powervs"
495-
496423
#Call to boskos to checkout resource
497424
source "./hack/boskos.sh"
498425
499426
#Setup of kubetest2 tf deployer and ginkgo tester
500427
make install-deployer-tf
501428
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
502429
503-
#Install ansible required to bring up k8s cluster on infra
504-
apt-get update && apt-get install -y ansible
505-
506-
K8S_BUILD_VERSION=$(curl -Ls https://dl.k8s.io/ci/latest.txt)
507-
508-
TIMESTAMP=$(date +%s)
509-
510430
set +o errexit
511431
set -o xtrace
512-
kubetest2 tf --powervs-image-name CentOS-Stream-9 \
432+
kubetest2 tf --powervs-image-name CentOS-Stream-9 --powervs-memory 32 \
513433
--powervs-region ${BOSKOS_REGION} --powervs-zone ${BOSKOS_ZONE} \
514-
--powervs-service-id ${BOSKOS_RESOURCE_ID} \
515-
--powervs-ssh-key k8s-prow-sshkey \
434+
--powervs-service-id ${BOSKOS_RESOURCE_ID} --powervs-ssh-key k8s-prow-sshkey \
516435
--ssh-private-key /etc/secret-volume/ssh-privatekey \
517-
--build-version $K8S_BUILD_VERSION \
518-
--release-marker $K8S_BUILD_VERSION \
519-
--cluster-name e2e-serial-$TIMESTAMP \
520-
--workers-count 2 \
521-
--up --down --auto-approve --ignore-destroy-errors \
522-
--retry-on-tf-failure 3 \
436+
--workers-count 2 --cluster-name e2e-serial-$(date +%s) \
437+
--up --down --auto-approve --retry-on-tf-failure 3 --ignore-destroy-errors\
523438
--break-kubetest-on-upfail true \
524-
--powervs-memory 32 \
525439
--extra-vars=container_runtime_test_handler:true \
440+
--build-version $(curl -Ls https://dl.k8s.io/ci/latest.txt) \
526441
--test=ginkgo -- --parallel 1 --test-package-dir ci --test-package-marker latest.txt \
527442
--focus-regex='\[Serial\]|\[Disruptive\]' --skip-regex='\[Driver:.gcepd\]|\[Flaky\]|\[Feature:.+\]|\[sig-cloud-provider-gcp\]'; rc=$?
528443

0 commit comments

Comments
 (0)