Skip to content

openshift-e2e-test: allow several upgrade targets#17778

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
vrutkovs:openshift-test-override-upgrade
Apr 16, 2021
Merged

openshift-e2e-test: allow several upgrade targets#17778
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
vrutkovs:openshift-test-override-upgrade

Conversation

@vrutkovs
Copy link
Copy Markdown
Contributor

@vrutkovs vrutkovs commented Apr 15, 2021

If override-upgrade file exists from shared dir, use this string as
target release. openshift-tests accepts comma-separated list of releases.

The change is an interim solution until https://issues.redhat.com/browse/DPTP-1829 and https://issues.redhat.com/browse/DPTP-1644 are implemented, as this solution would still be limited by a single step timeout.

See #17732 for rehearsals with this PR

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 15, 2021
@vrutkovs vrutkovs force-pushed the openshift-test-override-upgrade branch 2 times, most recently from 1e85e19 to 7df4f62 Compare April 15, 2021 15:44
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Existing jobs like release-openshift-origin-installer-e2e-aws-upgrade-4.5-to-4.6-to-4.7-to-4.8-ci use:

TEST_SUITE=all IMAGE=RELEASE_IMAGES run-upgrade-tests

with RELEASE_IMAGES replaced by $next_0,$next_1,$next_2. So maybe:

TARGET_RELEASES="${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}"
if [[ -f "${SHARED_DIR}/override-upgrade" ]]; then
    TARGET_RELEASES="$(< "${SHARED_DIR}/override-releases")"
    echo "Overriding upgrade target to ${TARGET_RELEASES[*]}"
fi
openshift-tests run-upgrade all \
  --to-image "${TARGET_RELEASES}" \
  ...

after updating origin to use --to-image the same way it currently uses IMAGE? Also, you'd need comma delimiters.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, run-upgrade-tests is just passing IMAGE through to --to-image, so no need to make any origin updates, it will already work with my suggestion.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, openshift-tests can already parse comma-delimited images? Nice, experimenting with it in #17732

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cluster version in #17732 shows that comma-delimited release image works, updated the PR.

If `override-upgrade` file exists from shared dir, use this string as
target release. `openshift-tests` accepts comma-separated list of releases.

This would enable support for chained upgrades (4.x -> 4.x + 1 -> 4.x.2) within a single test
@vrutkovs vrutkovs force-pushed the openshift-test-override-upgrade branch from 7df4f62 to 62903c5 Compare April 16, 2021 12:17
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 16, 2021

@vrutkovs: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/rehearse/openshift/installer/release-4.9/e2e-kubevirt 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-azure-resourcegroup 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-azure-shared-vpc 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-aws-shared-vpc 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-gcp-upi-xpn 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/openshift/cluster-logging-operator/tech-preview/e2e-operator 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/openshift/cloud-credential-operator/release-4.9/e2e-aws-manual-oidc 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/redhat-developer/jenkins-operator/main/e2e 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-gcp-shared-vpc 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/operator-framework/operator-marketplace/release-4.9/e2e-aws-upgrade 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-gcp-upi 7df4f624a782400615a92db1f31656efe948d208 link /test pj-rehearse
ci/rehearse/openshift/cluster-network-operator/release-4.9/e2e-azure-ovn-dualstack 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.1/e2e-aws-builds 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.1/e2e-aws-image-ecosystem 62903c5 link /test pj-rehearse
ci/rehearse/openshift/vsphere-problem-detector/release-4.9/e2e-vsphere 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.2/e2e-cmd 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.9/e2e-agnostic-cmd 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.9/e2e-aws-jenkins 62903c5 link /test pj-rehearse
ci/rehearse/openshift/cluster-network-operator/release-4.9/e2e-ovn-ipsec-step-registry 62903c5 link /test pj-rehearse
ci/rehearse/openshift/cluster-storage-operator/release-4.9/e2e-azure-csi 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.9/e2e-gcp-image-ecosystem 62903c5 link /test pj-rehearse
ci/rehearse/openshift/sdn/release-4.9/e2e-aws-multitenant 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.9/e2e-aws 62903c5 link /test pj-rehearse
ci/rehearse/openshift/ovn-kubernetes/release-4.9/e2e-aws-ovn 62903c5 link /test pj-rehearse
ci/rehearse/openshift/ovn-kubernetes/release-4.9/e2e-azure-ovn 62903c5 link /test pj-rehearse
ci/rehearse/openshift/ovn-kubernetes/release-4.9/e2e-ovn-hybrid-step-registry 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.9/e2e-aws-fips 62903c5 link /test pj-rehearse
ci/rehearse/openshift/vmware-vsphere-csi-driver/release-4.9/e2e-vsphere-csi 62903c5 link /test pj-rehearse
ci/rehearse/openshift/cluster-etcd-operator/release-4.9/e2e-gcp-disruptive-ovn 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.9/e2e-aws-disruptive 62903c5 link /test pj-rehearse
ci/rehearse/openshift/cluster-etcd-operator/release-4.9/e2e-aws-disruptive-ovn 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.9/e2e-gcp-builds 62903c5 link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.9/e2e-gcp-disruptive 62903c5 link /test pj-rehearse
ci/rehearse/openshift/machine-config-operator/release-4.9/e2e-gcp-single-node 62903c5 link /test pj-rehearse
ci/rehearse/openshift/ovn-kubernetes/release-4.9/e2e-gcp-ovn 62903c5 link /test pj-rehearse
ci/prow/pj-rehearse 62903c5 link /test pj-rehearse

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Copy link
Copy Markdown
Member

@wking wking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 16, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrutkovs, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit a76ec8c into openshift:master Apr 16, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@vrutkovs: Updated the step-registry configmap in namespace ci at cluster app.ci using the following files:

  • key openshift-e2e-test-commands.sh using file ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh
Details

In response to this:

If override-upgrade file exists from shared dir, use this string as
target release. openshift-tests accepts comma-separated list of releases.

The change is an interim solution until https://issues.redhat.com/browse/DPTP-1829 and https://issues.redhat.com/browse/DPTP-1644 are implemented, as this solution would still be limited by a single step timeout.

See #17732 for rehearsals with this PR

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants