Skip to content

step-registry: add upgrade workflows #11247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

stevekuznetsov
Copy link
Contributor

Signed-off-by: Steve Kuznetsov [email protected]

Supersedes openshift/ci-tools#1136

@stevekuznetsov
Copy link
Contributor Author

/cc @wking

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 26, 2020
@stevekuznetsov stevekuznetsov force-pushed the skuznets/e2e-upgrade branch 2 times, most recently from 1162283 to 6487985 Compare August 26, 2020 04:54
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 26, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 26, 2020
@stevekuznetsov
Copy link
Contributor Author

OK I think this is working as expected now

@stevekuznetsov
Copy link
Contributor Author

Wish this didn't start thirty rehearsals 😬

@stevekuznetsov
Copy link
Contributor Author

Oh, I see. "real" releases don't have ocp/foo:base so that's why @AlexNPavel used CentOS...

  Warning  Failed     15m (x3 over 16m)   kubelet, origin-ci-ig-n-4wmz  Failed to pull image "docker-registry.default.svc:5000/ci-op-mm2lhxw0/stable:base": rpc error: code = Unknown desc = Error: image ci-op-mm2lhxw0/stable:base not found

The "base" image is present only from CI streams and won't be around for
jobs that operate on imported releases, so using a generic CentOS image
instead will work for all types of jobs.

Signed-off-by: Steve Kuznetsov <[email protected]>
@stevekuznetsov
Copy link
Contributor Author

$ oc --context api.ci --namespace ci-op-j7z1thct get istag release:initial
NAME              DOCKER REF                                                                                                          UPDATED
release:initial   quay.io/openshift-release-dev/ocp-release@sha256:624e84b5d22cb865ee1be32aa6e3feea99917c6081f7a9c5b1185fc9934d23f3   3 minutes ago
$ oc --context api.ci --namespace ci-op-j7z1thct logs e2e-44-stable-to-45-ci-ipi-install-install -c test -f
Installing from release registry.svc.ci.openshift.org/ci-op-j7z1thct/release@sha256:624e84b5d22cb865ee1be32aa6e3feea99917c6081f7a9c5b1185fc9934d23f3
level=info msg="Credentials loaded from the \"default\" profile in file \"/var/run/secrets/ci.openshift.io/cluster-profile/.awscred\""
...

Seems to work!

@petr-muller
Copy link
Member

This looks neat! The "supersedes" link in the description is wrong: I think #9489 is the correct one.

@alvaroaleman
Copy link
Contributor

/uncc

@openshift-ci-robot openshift-ci-robot removed the request for review from alvaroaleman August 26, 2020 14:03
@@ -0,0 +1,11 @@
approvers:
Copy link
Member

Choose a reason for hiding this comment

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

Symlink to ../OWNERS? I doubt we will need flavor-specific maintainer sets here, and your current sets look like dups.

@stevekuznetsov
Copy link
Contributor Author

@wking the install is failing catastrophically - but I think the job config is right?

Signed-off-by: Steve Kuznetsov <[email protected]>
@wking
Copy link
Member

wking commented Aug 26, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

8 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Aug 26, 2020

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

Test name Commit Details Rerun command
ci/rehearse/periodic-ci-openshift-release-master-ocp-4.5-ci-e2e-4.4-stable-to-4.5-ci 4731300b37a7f40c1c7ab1342f5f4b191c188b3c link /test pj-rehearse

Full PR test history. Your PR dashboard.

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.

@stevekuznetsov
Copy link
Contributor Author

/test all

@openshift-merge-robot openshift-merge-robot merged commit a21bfed into openshift:master Aug 26, 2020
@openshift-ci-robot
Copy link
Contributor

@stevekuznetsov: Updated the following 5 configmaps:

  • ci-operator-master-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-release-master__ocp-4.5-ci.yaml using file ci-operator/config/openshift/release/openshift-release-master__ocp-4.5-ci.yaml
  • job-config-master configmap in namespace ci at cluster api.ci using the following files:
    • key openshift-release-master-periodics.yaml using file ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml
  • job-config-master configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-release-master-periodics.yaml using file ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml
  • step-registry configmap in namespace ci at cluster api.ci using the following files:
    • key ipi-conf-aws-ref.yaml using file ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml
    • key ipi-conf-ref.yaml using file ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml
    • key ipi-install-install-commands.sh using file ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
    • key ipi-install-install-ref.yaml using file ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
    • key metadata.json using file ci-operator/step-registry/metadata.json
    • key OWNERS using file ci-operator/step-registry/openshift/upgrade/OWNERS
    • key OWNERS using file ci-operator/step-registry/openshift/upgrade/aws/OWNERS
    • key openshift-upgrade-aws-workflow.yaml using file ci-operator/step-registry/openshift/upgrade/aws/openshift-upgrade-aws-workflow.yaml
  • step-registry configmap in namespace ci at cluster app.ci using the following files:
    • key ipi-conf-aws-ref.yaml using file ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml
    • key ipi-conf-ref.yaml using file ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml
    • key ipi-install-install-commands.sh using file ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
    • key ipi-install-install-ref.yaml using file ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
    • key metadata.json using file ci-operator/step-registry/metadata.json
    • key OWNERS using file ci-operator/step-registry/openshift/upgrade/OWNERS
    • key OWNERS using file ci-operator/step-registry/openshift/upgrade/aws/OWNERS
    • key openshift-upgrade-aws-workflow.yaml using file ci-operator/step-registry/openshift/upgrade/aws/openshift-upgrade-aws-workflow.yaml

In response to this:

Signed-off-by: Steve Kuznetsov [email protected]

Supersedes openshift/ci-tools#1136

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.

openshift-merge-robot pushed a commit that referenced this pull request Aug 31, 2020
As originally done in #11247.
`tools` only exists in 4.5+ releases.
wking added a commit to wking/openshift-release that referenced this pull request Mar 5, 2021
Tests generally install one OpenShift release, and then perform some
actions to validate that release.  Sometimes the actions include
updating to a different release, or a series of different releases.
With this commit, I'm pivoting to dependency naming that more clearly
reflects these goals, instead of "RELEASE_IMAGE_LATEST", which was a
reflection of the default release:latest value, and not an expression
of the intended semantics.

I've shifted to explicitly declaring these image dependencies, taking
advantage of openshift/ci-tools@782008c873 (ci-operator: allow users
to depend on images in steps, 2020-07-30, openshift/ci-tools#1044),
instead of relying on the implicit RELEASE_IMAGE_LATEST and similar.

I've dropped explicit dependencies that were not used in a step's
associated commands, like RELEASE_IMAGE_LATEST in ipi-install since
eb8eb32 (step-registry: add upgrade workflows, 2020-08-25, openshift#11247).

I've dropped explicit dependency overrides that set the same value as
the default.  For example, there was no need to set:

  OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"

in openshift-upgrade-aws-loki, because release:latest is already the
default in all steps that consume OPENSHIFT_UPGRADE_RELEASE_IMAGE.

I've dropped the _OVERRIDE suffix from the dependencies, because while
we may set that suffix when communicating with the openshift-install
command, it's a legitimate knob and not a strange override in each
steps' public API.
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.

7 participants