USHIFT-2170: support upgrading 2 Y versions at a time#2952
Merged
openshift-merge-bot[bot] merged 9 commits intoopenshift:mainfrom Mar 7, 2024
Merged
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@dhellmann: This pull request references USHIFT-2170 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the spike to target the "4.16.0" version, but no target version was set. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
openshift-ci
bot
added
the
approved
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
2 times, most recently
from
4171edc to
e4c9cb8
Compare
dhellmann
changed the title
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
Contributor
Author
|
This should be rebased on #2950 before it is merged. /hold |
openshift-ci
bot
added
the
do-not-merge/hold
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
from
e4c9cb8 to
9117d79
Compare
openshift-merge-robot
added
the
needs-rebase
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
from
9117d79 to
55d4aa0
Compare
openshift-merge-robot
removed
the
needs-rebase
Contributor
Author
|
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
from
55d4aa0 to
5aa8273
Compare
Contributor
Author
|
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
from
5aa8273 to
08c0abd
Compare
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
2 times, most recently
from
2d50b02 to
a9caa1f
Compare
Contributor
Author
|
/hold cancel rebased after #2950 merged |
openshift-ci
bot
removed
the
do-not-merge/hold
Contributor
Author
|
The issue is a package dependency problem between selinux-policy-targeted and osbuild. https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_microshift/2952/pull-ci-openshift-microshift-main-microshift-metal-tests/1755264697868750848 Let's see if that's being caused by a RHEL CDN or cache problem. /retest-required |
Contributor
Author
|
Same dependency error |
Contributor
Author
|
More background in openshift/enhancements#1562 |
Contributor
Author
|
/retest-required |
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
from
2d0bf81 to
d0b62f6
Compare
Contributor
Author
|
The `dnf repoquery` command does not require a repository to be enabled in order to check its contents. Since we use the command to look for old versions of MicroShift, in repositories that might not be enabled, we should not require the repo to be enabled before performing the query.
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
from
a642ca7 to
f16d284
Compare
dhellmann
commented
Mar 6, 2024
| newest=$(sudo dnf repoquery microshift --quiet --queryformat '%{version}-%{release}' --repo "${rhsm_repo}" | sort --version-sort | tail -n1) | ||
| if [ -n "${newest}" ]; then | ||
| echo "${newest}" | ||
| return |
Contributor
Author
There was a problem hiding this comment.
@pmtk I think this is the change you've mentioned that we need, please take a look when you have a few minutes.
Member
There was a problem hiding this comment.
I think so.
BTW. command can be changed to sudo dnf repoquery --quiet --latest-limit 1 --qf "%{version}-%{release}" --repo "${rhsm_repo}" microshift - --latest-limit instead of | sort | tail
Member
There was a problem hiding this comment.
If that function were to return "version,repo", then YMINUS2_RELEASE_REPO="$(get_ocp_repo_name_for_version ${YMINUS2_MINOR_VERSION})" could be cut -d, -f2 but I'm fine with either
Contributor
Author
There was a problem hiding this comment.
I thought about that. I liked the simplicity of that repo being explicitly known to exist in the caller, but maybe the symmetry of always having some repo reference returned is better? I'll defer to you, let me know if I should change it.
Contributor
Author
|
/retest-required |
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
from
e7140db to
65552c9
Compare
Contributor
Author
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
ggiguash
reviewed
Mar 7, 2024
…active make container extraction more flexible about handling repositories by handling repo names, paths, and URLs
Co-authored-by: Gregory Giguashvili <85498834+ggiguash@users.noreply.github.com>
dhellmann
force-pushed
the
USHIFT-2081-eus-upgrade-spike
branch
from
b66273e to
9d43c9d
Compare
pmtk
reviewed
Mar 7, 2024
| @@ -0,0 +1,10 @@ | |||
| {{- if env.Getenv "RHOCP_MINOR_Y2" "" -}} | |||
Member
There was a problem hiding this comment.
Some comment said RHOCP for y-2 will always be available - do we need if here?
Contributor
Author
There was a problem hiding this comment.
Good point, I can remove that.
Member
|
/lgtm |
Member
|
/hold |
openshift-ci
bot
added
do-not-merge/hold
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dhellmann, ggiguash, pmtk The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
Author
|
/hold cancel I'll take care of the suggested cleanup in a follow-up PR. |
openshift-ci
bot
removed
the
do-not-merge/hold
Contributor
|
@dhellmann: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
/assign @pmtk