From 0e203ff351874f8e2c97c0cb5cd04f556db44c4c Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 21 Oct 2020 22:23:02 -0700 Subject: [PATCH 1/2] ci-operator/jobs/openshift/release: Fix 4.4 -> 4.6 in chained update Skip 4.3 and start with 4.4, instead of expecting a 4.4 -> 4.6 hop to work. Fixes a typo from the file's creation in 7228c7b60d (release-controller: branch for 4.7, 2020-04-23, #8532). --- .../release/openshift-release-release-4.7-periodics.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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..717d281467796 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 @@ -4690,7 +4690,7 @@ periodics: job-test: e2e pj-rehearse.openshift.io/can-be-rehearsed: "true" release.openshift.io/verify: "true" - name: release-openshift-origin-installer-e2e-aws-upgrade-4.3-to-4.4-to-4.6-to-4.7-ci + name: release-openshift-origin-installer-e2e-aws-upgrade-4.4-to-4.5-to-4.6-to-4.7-ci spec: containers: - args: @@ -4712,13 +4712,13 @@ periodics: data=$(ARTIFACTS)/release.json - if ! curl --fail -X GET -G --location https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4-stable/latest --data-urlencode 'in=>4.3.0 <4.4.0-0' > ${data}; then + if ! curl --fail -X GET -G --location https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4-stable/latest --data-urlencode 'in=>4.4.0 <4.5.0-0' > ${data}; then echo "error: Could not find an initial version" exit 1 fi export RELEASE_IMAGE_INITIAL=$( python -c 'from __future__ import print_function; import json,sys; print(json.load(open(sys.argv[1], "r"))["pullSpec")' "${data}" ) - if ! curl --fail -X GET -G --location https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4-stable/latest --data-urlencode 'in=>4.4.0 <4.6.0-0' > ${data}; then + if ! curl --fail -X GET -G --location https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4-stable/latest --data-urlencode 'in=>4.5.0 <4.6.0-0' > ${data}; then echo "error: Could not find a middle version" exit 1 fi From cdc7d6006685116398d904adccae99944193b8bd Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 23 Oct 2020 09:45:40 -0700 Subject: [PATCH 2/2] ci-operator/jobs/openshift/release: 'exec' ci-operator in 4.7's chained update test We are currently timing these out: $ curl -s https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_release/13019/rehearse-13019-release-openshift-origin-installer-e2e-aws-upgrade-4.4-to-4.5-to-4.6-to-4.7-ci/1319606966804287488/build-log.txt | tail 2020/10/23 11:51:41 Running pod e2e-aws-upgrade 2020/10/23 12:24:35 Container setup in pod e2e-aws-upgrade completed successfully {"component":"entrypoint","file":"prow/entrypoint/run.go:165","func":"k8s.io/test-infra/prow/entrypoint.Options.ExecuteProcess","level":"error","msg":"Process did not finish before 4h0m0s timeout","severity":"error","time":"2020-10-23T15:50:19Z"} time="2020-10-23T15:50:19Z" level=info msg="Received signal." signal=interrupt 2020/10/23 15:50:19 error: Process interrupted with signal interrupt, cancelling execution... 2020/10/23 15:50:19 cleanup: Deleting release pod release-images-initial 2020/10/23 15:50:19 cleanup: Deleting release pod release-images-latest 2020/10/23 15:50:19 cleanup: Deleting template e2e-aws-upgrade 2020/10/23 15:50:19 error: Could not delete template instance: context canceled {"component":"entrypoint","file":"prow/entrypoint/run.go:250","func":"k8s.io/test-infra/prow/entrypoint.gracefullyTerminate","level":"error","msg":"Process did not exit before 30m0s grace period","severity":"error","time":"2020-10-23T16:20:19Z"} I suspect something funny with SIGTERM propagation, and exec'ing ci-operator will remove one layer of shell process from the signal chain. --- .../release/openshift-release-release-4.7-periodics.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 717d281467796..f53e8a8c5c690 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 @@ -4739,7 +4739,7 @@ periodics: export RELEASE_IMAGE_LATEST=${next_2} export CONFIG_SPEC="${CONFIG_SPEC/RELEASE_IMAGES/$next_0,$next_1,$next_2}" - ci-operator $@ + exec ci-operator $@ - "" env: - name: BRANCH