-
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
[release-3.11] Call version.yml before repos.yml to ensure openshift_version is set #10742
[release-3.11] Call version.yml before repos.yml to ensure openshift_version is set #10742
Conversation
@sdodson , let me know if there was a reason why version.yml can't be called before; I'm not excessively familiar with the openshift-side playbooks. |
/retest |
/lgtm |
@vrutkovs Would it be possible for you to take a look, or suggest someone... ? |
/cc @michaelgugino |
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.
/hold
playbooks/init/main.yml
Outdated
@@ -22,6 +22,8 @@ | |||
|
|||
- import_playbook: basic_facts.yml | |||
|
|||
- import_playbook: version.yml |
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.
This change conflicts with the need to run cluster_facts.yml in order to set current version to feed into version role.
Here's where we are now: Our openshift_repos role has become a "openshift and rhel-server repos" role which it was never intended to be. Thus, there is a requirement to run repos before base_packages for some of our users (openstack, possibly aws provisioning plays).
What we can do instead:
In 3.11, we put a default value for openshift_release in the openshift_version role. We can pull openshift_version in as a meta-dependency on the repos role, and use variable openshift_release in place of variable openshift_version in the repos role.
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.
@michaelgugino Thanks for the review! What default value would you suggest for openshift_release? Would you like me to attempt this change, or would you prefer someone with more experience with the repos roles?
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.
@tzumainn If you include openshift_version role as a dependency in roles/openshift_repos/meta/main.yml, you won't need to set openshift_release because we have a default value for it defined in the openshift_version role.
/lgtm cancel |
e2f81b6
to
0c50652
Compare
@michaelgugino thanks! I think I understand. I've updated the PR; is this what you meant? |
/retest |
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.
This is not what I meant. I'm not sure how else to describe what I meant; I can get a patch out tomorrow.
@michaelgugino I see what you mean now, but leads me to a question: roles/openshift_version/tasks/main.yml is empty; instead it's first_master.yml that sets the relevant parameters. I couldn't find a way to specify that within a role dependency; is there some syntax that would help here? |
@tzumainn essentially what I'm suggesting would be to bring the openshift_version role's defaults (defaults/main.yml) into scope. I don't intend for any tasks to actually run, the only value I'm interested in is openshift_release. We can modify openshift_repos role to use openshift_release variable instead of openshift_version variable. |
0c50652
to
d95ca4f
Compare
@michaelgugino Thanks for the clarification. I updated the PR; is this what you're suggesting? |
/retest |
/test e2e-aws |
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.
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: luis5tb, michaelgugino, tzumainn 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 |
/test e2e-aws |
@michaelgugino Thanks for the /lgtm! Does the PR also need the hold removed? |
/hold cancel |
/test e2e-aws |
4 similar comments
/test e2e-aws |
/test e2e-aws |
/test e2e-aws |
/test e2e-aws |
/test e2e-aws |
3 similar comments
/test e2e-aws |
/test e2e-aws |
/test e2e-aws |
/refresh |
@tzumainn: The following test 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. |
GCP quota problems. |
repos.yml requires openshift_version to be set if RHEL repositories are to be enabled. Calling version.yml before repos.yml ensures openshift_version is set.