-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
Flatten all rpm packages other than atomic-openshift-utils #4264
Conversation
[test] |
What do we need to install now? This looks like it will be backwards incompatible with the current jobs but we can hack around it so it can go in more cleanly. |
@stevekuznetsov The provides and obsoletes should make it transparent but long term you'll just want to drop everything other than openshift-ansible. |
The previous test job makes it look like obsoletes means you cannot install a specific version of a package. I'll try some more testing locally. |
We can also add glue logic to the jobs for now: if yum list available atomic-openshift-utils-${version} >/dev/null 2>&1; then
yum install atomic-openshift-utils-${version}
else
yum install openshift-ansible-${version}
fi |
2630b04
to
263d2f4
Compare
[test] |
It seems to cleanly upgrade now. So this is ready for review.
|
Got rid of the whitespace diffs. |
aos-ci-test |
[merge] |
@sdodson did the bot miss this? what if i say merge ... Edit: rosie was ignoring this PR because it's old. |
[merge] |
Evaluated for openshift ansible test up to 08c758f |
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_openshift_ansible/578/) (Base Commit: a00df57) (PR Branch Commit: 08c758f) |
https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/959/ has flakes openshift/origin#16005 and openshift/origin#10162 Try another [merge] |
Evaluated for openshift ansible merge up to 08c758f |
continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/961/) (Base Commit: a00df57) (PR Branch Commit: 08c758f) |
https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/961/ looks like a legit failure. It seems the obsoletes are messing things up when yum tries to set up for the upgrade.
It seems like even though it specifically requests the 3.6 versions, the obsoletes from the 3.7 version are taking effect and making yum try to install that instead of the obsolete RPMs. This seems weird to me. I'm not sure this would be a problem in any customer use case but it obviously is in CI and probably would be for online too. |
Testing with Obsoletes >= 3.7 |
I've tried removing the Provides and it fails with a depsolving issue. @jhadvig Do we have the option of making sure that 3.7 repos aren't enabled when 3.6 packages are being installed? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From my perspective it makes sense to flatten the pkgs. But we will have to make sure that we either backport this change to all the versions of openshift-ansible or make sure that we condition our tests to use the openshift-ansible-utils pkg from the version that will be build now on.
@sdodson Are we going to ship this? |
one day we will, it works fine with the exception of some rather broken CI processes. |
@sdodson PR needs rebase |
@sdodson let's ship this puppy. |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sdodson 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 |
@sdodson is this PR still relevant? |
@sdodson: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your 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. I understand the commands that are listed here. |
Master branch is closed! A major refactor is ongoing in devel-40. Changes for 3.x should be made directly to the latest release branch they're relevant to and backported from there. |
I can think of no situation where someone would want to individually install roles, playbooks, filter_plugins, or other subpackages without installing all the rest. The same applies to upgrading each of those. So in the interest of simplicity lets squash the packaging back down to just the quick installer (atomic-openshift-utils) and ansible code (openshift-ansible).
Fixes #3469