Skip to content

ci-operator/step-registry/baremetalds/devscripts/setup: Set OPENSHIFT_UPGRADE_RELEASE_IMAGE #25123

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.

Sign up for GitHub

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

Closed
wking wants to merge 1 commit into from
Closed

ci-operator/step-registry/baremetalds/devscripts/setup: Set OPENSHIFT_UPGRADE_RELEASE_IMAGE #25123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...rator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ cd dev-scripts
cp /root/pull-secret /root/dev-scripts/pull_secret.json

echo "export OPENSHIFT_RELEASE_IMAGE=${OPENSHIFT_INSTALL_RELEASE_IMAGE}" >> /root/dev-scripts/config_root.sh
echo "export OPENSHIFT_UPGRADE_RELEASE_IMAGE=${OPENSHIFT_UPGRADE_RELEASE_IMAGE}" >> /root/dev-scripts/config_root.sh
echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh
echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh
echo "export NUM_WORKERS=3" >> /root/dev-scripts/config_root.sh
Expand Down
2 changes: 2 additions & 0 deletions ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ ref:
dependencies:
- name: "release:latest"
env: OPENSHIFT_INSTALL_RELEASE_IMAGE
- name: "release:latest"
env: OPENSHIFT_UPGRADE_RELEASE_IMAGE
Copy link
Contributor

@andfasano andfasano Jan 11, 2022

Choose a reason for hiding this comment

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

Any specific reason to define a new distinct var? I guess we could reuse

release/ci-operator/step-registry/baremetalds/e2e/upgrade/baremetalds-e2e-upgrade-workflow.yaml

Line 12 in b817dee

OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"

Copy link
Member Author

@wking wking Jan 11, 2022

Choose a reason for hiding this comment

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

I don't think OVERRIDE is all that appropriate here. I felt strongly enough to break from tradition with my new variable, but not strongly enough to try and update existing variables.

Copy link
Contributor

@andfasano andfasano Jan 11, 2022

Choose a reason for hiding this comment

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

I think this could be a problematic duplication, given that the upgrade workflow already defined the OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE var (note: this was taken from the standard openshift e2e test step, as in future we'd like to use it directly) to specify the target release for the upgrade.
On the dev-scripts side of course there will be more choice for the naming of the exported configuration variable

Copy link
Member Author

@wking wking Jan 12, 2022

Choose a reason for hiding this comment

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

One day I'll get those steps moved too by reviving #12959. I just haven't been able to track down approvers yet. Anyhow, having the scripts prefer one and fall back to another is pretty easy:

OPENSHIFT_UPGRADE_RELEASE_IMAGE="${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE:-${OPENSHIFT_UPGRADE_RELEASE_IMAGE}}"
some_consumer "${OPENSHIFT_UPGRADE_RELEASE_IMAGE}"

But also, this is not my step, so feel free to file alternative PRs with whatever handling makes the most sense to you; no need to just follow my preferences ;)

documentation: |-
Checkout and execute dev-scripts on a packet server
2 changes: 1 addition & 1 deletion ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ ref:
- name: "release:latest"
env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE
documentation: |-
The Baremtal DS E2E step executes the common end-to-end test suite.
The Baremetal DS E2E step executes the common end-to-end test suite.