From 787098cebda8951d444dfcbf4c44a0e2bbe58b6a Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 19 Oct 2021 13:23:40 -0700 Subject: [PATCH] ci-operator/step-registry/openshift/e2e/test: Wait for unpaused compute to level Before running the post-update conformance tests. Without this, 4.8->4.9->4.10 jobs are failing on [1,2]: : [sig-arch][Early] Managed cluster should start all core operators [Skipped:Disconnected] [Suite:openshift/conformance/parallel] 0s fail [github.com/onsi/ginkgo@v4.7.0-origin.0+incompatible/internal/leafnodes/runner.go:113]: Oct 17 23:28:57.284: Some cluster operators are not ready: kube-apiserver (Upgradeable=False KubeletMinorVersion_KubeletMinorVersionUnsupportedNextUpgrade: KubeletMinorVersionUpgradeable: Kubelet minor versions on nodes ip-10-0-135-91.ec2.internal, ip-10-0-168-151.ec2.internal, and ip-10-0-192-244.ec2.internal will not be supported in the next OpenShift minor version upgrade.) [1]: https://testgrid.k8s.io/redhat-openshift-ocp-release-4.10-informing#periodic-ci-openshift-release-master-nightly-4.10-upgrade-from-stable-4.8-e2e-aws-upgrade-paused [2]: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-release-master-nightly-4.10-upgrade-from-stable-4.8-e2e-aws-upgrade-paused/1449821870344900608 --- .../openshift/e2e/test/openshift-e2e-test-commands.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh index 1b0b9ebacde17..2e0d8942e9be7 100755 --- a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh +++ b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh @@ -218,6 +218,9 @@ function upgrade_paused() { echo "Starting worker upgrade to ${OPENSHIFT_UPGRADE1_RELEASE_IMAGE_OVERRIDE}" oc patch mcp/worker --type merge --patch '{"spec":{"paused":false}}' + oc wait mcp/worker --for condition=Updated & + wait "$!" + echo "Workers upgraded to ${OPENSHIFT_UPGRADE1_RELEASE_IMAGE_OVERRIDE}; starting post-update conformance tests" openshift-tests run-upgrade all \ --to-image "${OPENSHIFT_UPGRADE1_RELEASE_IMAGE_OVERRIDE}" \ --options "${TEST_UPGRADE_OPTIONS-}" \