From 9ed219384750be8466baa6ef285e5e188ac8a3d1 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 21 Oct 2020 12:43:05 -0700 Subject: [PATCH] ci-operator/jobs/openshift/release: Use upgrade-all in chained updates Using the 'upgrade-all' precedent from cfcd60fed1 (release: Standardize all ci-chat-bot jobs, 2020-04-27, #8594). I'm not clear on why we are joining with a newline instead of '&&'; presumably this is getting wrapped in a 'set -e' or equivalent. But I'm sticking with newline to match precedent. This increases the risk that we time out these slow jobs (e.g. [1] took 3h42m), but we really want to exercise tests like openshift/origin@9f7fe0089d (Add test for scaling machineSets, 2019-04-11, openshift/origin#22564), which is in openshift/conformance/serial, because machines launch with the born-in boot images until we get [2]. And in fact, the reason why we didn't have this post-update suite in 4.6 was because of 3bc9d8e6af (stop running e2e tests after three upgrades because we hit timeouts and lose upgrade signal, 2020-10-05, #12436). But since 3c915e2f0c (ci-operator/step-registry/openshift/e2e/test: Add 2h active_deadline_seconds, 2020-10-09, #12647), we no longer have to worry about getting logs when that step is slow. So we might not pass if we're slow, but we'll still get logs to debug why we're slow. Only for 4.6 and later, because 4.5 is live and if we had problems there we'd probably have already heard about them from customers. [1]: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/release-openshift-origin-installer-e2e-aws-upgrade-4.3-to-4.4-to-4.5-to-4.6-ci/1318709056830967808 [2]: https://github.com/openshift/enhancements/pull/201 --- .../openshift-release-release-4.6-periodics.yaml | 12 +++++++++--- .../openshift-release-release-4.7-periodics.yaml | 14 ++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml index 2414e76f8ba08..a72f1c95e2888 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml @@ -5315,8 +5315,8 @@ periodics: - --lease-server-password-file=/etc/boskos/password - --lease-server-username=ci - --secret-dir=/usr/local/pull-secret - - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile - - --target=e2e-$(CLUSTER_TYPE)-upgrade + - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-all-cluster-profile + - --target=e2e-$(CLUSTER_TYPE)-upgrade-all - --input-hash=$(BUILD_ID) - --input-hash=$(JOB_NAME) command: @@ -5389,6 +5389,12 @@ periodics: openshift_installer: cluster_profile: "$(CLUSTER_TYPE)" upgrade: true + - as: e2e-$(CLUSTER_TYPE)-upgrade-all + commands: | + TEST_SUITE=all IMAGE=RELEASE_IMAGES run-upgrade-tests; TEST_SUITE=openshift/conformance run-tests + openshift_installer: + cluster_profile: "$(CLUSTER_TYPE)" + upgrade: true - as: launch-$(CLUSTER_TYPE) commands: sleep 9000 & wait openshift_installer: @@ -5406,7 +5412,7 @@ periodics: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-aws-upgrade-all-cluster-profile name: cluster-profile - mountPath: /usr/local/pull-secret name: release-pull-secret diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml index c110dbbda127d..bc2195d51c2d9 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml @@ -4699,8 +4699,8 @@ periodics: - --lease-server-password-file=/etc/boskos/password - --lease-server-username=ci - --secret-dir=/usr/local/pull-secret - - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile - - --target=e2e-$(CLUSTER_TYPE)-upgrade + - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-aws-cluster-profile + - --target=e2e-$(CLUSTER_TYPE)-upgrade-all - --input-hash=$(BUILD_ID) - --input-hash=$(JOB_NAME) command: @@ -4770,7 +4770,13 @@ periodics: - as: e2e-$(CLUSTER_TYPE)-upgrade commands: | TEST_SUITE=all IMAGE=RELEASE_IMAGES run-upgrade-tests - TEST_SUITE=openshift/conformance/parallel run-tests + openshift_installer: + cluster_profile: "$(CLUSTER_TYPE)" + upgrade: true + - as: e2e-$(CLUSTER_TYPE)-upgrade-all + commands: | + TEST_SUITE=all IMAGE=RELEASE_IMAGES run-upgrade-tests + TEST_SUITE=openshift/conformance run-tests openshift_installer: cluster_profile: "$(CLUSTER_TYPE)" upgrade: true @@ -4791,7 +4797,7 @@ periodics: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-aws-upgrade-all-cluster-profile name: cluster-profile - mountPath: /usr/local/pull-secret name: release-pull-secret