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 dd7e8bda4c85b..05454f7dde58e 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 @@ -5164,49 +5164,31 @@ periodics: - --input-hash=$(BUILD_ID) - --input-hash=$(JOB_NAME) command: - - /bin/bash - - -c - - | - #!/bin/bash - set -euo pipefail - - initial=$(ARTIFACTS)/release-initial.json - latest=$(ARTIFACTS)/release-latest.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.6.0-0 <4.7.0-0' > ${initial}; then - echo "error: Could not find a stable version" - exit 1 - fi - if ! curl --fail -X GET -G --location https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4.7.0-0.ci/latest > ${latest}; then - echo "error: Could not find newest version" - exit 1 - fi - - from=$( python -c 'from __future__ import print_function; import json,sys; print(json.load(open(sys.argv[1], "r"))["name"])' "${initial}" ) - to=$( python -c 'from __future__ import print_function; import json,sys; print(json.load(open(sys.argv[1], "r"))["name"])' "${latest}" ) - export RELEASE_IMAGE_INITIAL=$( python -c 'from __future__ import print_function; import json,sys; print(json.load(open(sys.argv[1], "r"))["pullSpec"])' "${initial}" ) - export RELEASE_IMAGE_LATEST=$( python -c 'from __future__ import print_function; import json,sys; print(json.load(open(sys.argv[1], "r"))["pullSpec"])' "${latest}" ) - - # prow doesn't allow init containers or a second container - export PATH=$PATH:/tmp/bin - mkdir /tmp/bin - curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.6/linux/oc.tar.gz | tar xvzf - -C /tmp/bin/ oc - chmod ug+x /tmp/bin/oc - - # annotate the information about this job so that we can query for it - oc --kubeconfig /etc/appci/sa.release-bot.app.ci.config annotate pj/${PROW_JOB_ID} "release.openshift.io/from-tag=${from}" "release.openshift.io/tag=${to}" "release.openshift.io/source=ocp/$(BRANCH)" - - ci-operator $@ - - "" + - ci-operator env: - - name: BRANCH - value: "4.6" + - name: RELEASE_IMAGE_INITIAL + - name: RELEASE_IMAGE_LATEST - name: CLUSTER_TYPE value: aws - - name: CONFIG_SPEC + - name: UNRESOLVED_CONFIG value: | - tag_specification: - name: "$(BRANCH)" - namespace: ocp + base_images: + base: + name: "4.7" + namespace: ocp + tag: base + releases: + initial: + prerelease: + product: ocp + version_bounds: + lower: "4.6.0" + upper: "4.7.0-0" + latest: + candidate: + product: ocp + stream: ci + version: "4.7" resources: '*': limits: @@ -5216,10 +5198,11 @@ periodics: memory: 200Mi tests: - as: e2e-$(CLUSTER_TYPE)-upgrade - commands: TEST_SUITE=all TEST_OPTIONS=abort-at=99 run-upgrade-tests - openshift_installer: + steps: cluster_profile: "$(CLUSTER_TYPE)" - upgrade: true + env: + TEST_OPTIONS: "abort-at=99" + workflow: openshift-upgrade-aws-loki image: ci-operator:latest imagePullPolicy: Always name: ""