Skip to content
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

Jump to bottom

[3.6] Force reconciliation of role for 3.6 #5649

Merged
merged 3 commits into from Oct 10, 2017
Merged

[3.6] Force reconciliation of role for 3.6 #5649

merged 3 commits into from Oct 10, 2017

Conversation

sdodson
Copy link
Member

@sdodson sdodson commented Oct 3, 2017

This is needed because in 3.6 we cannot reconcile non-cluster roles in the
bootstrap reconciliation code. In 3.7 this is taken care of in code.

Adds version_gte_3_7 facts and Backports #5617

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 3, 2017
@sdodson sdodson changed the title Release 3.6 [3.6] Force reconciliation of role for 3.6 Oct 3, 2017
@simo5
Copy link
Contributor

simo5 commented Oct 4, 2017

/test upgrade

@sdodson
Copy link
Member Author

sdodson commented Oct 4, 2017

/retest

@simo5
Copy link
Contributor

simo5 commented Oct 4, 2017

/hold
please check th changes on the PR in master

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 4, 2017
@sdodson
Copy link
Member Author

sdodson commented Oct 9, 2017

@simo5 ok, I've been able to confirm that this works for both positive and negative cases.

@sdodson sdodson force-pushed the release-3.6 branch 3 times, most recently from 745f229 to 7f58913 Compare October 9, 2017 15:17
@simo5 @sdodson
Force reconciliation of role for 3.6
af0f834 
This is needed because in 3.6 we cannot reconcile non-cluster roles in the
bootstrap reconciliation code.
In 3.7 this is taken care of in code.

Signed-off-by: Simo Sorce <simo@redhat.com>
@simo5
Copy link
Contributor

simo5 commented Oct 10, 2017

/test upgrade

@sdodson
Copy link
Member Author

sdodson commented Oct 10, 2017 •
edited

That last test looks like it failed conformance tests while still running 1.5 prior to upgrading to 3.6. I was hoping to at least see the ansible tasks execute if not a green test run.

@simo5
Copy link
Contributor

simo5 commented Oct 10, 2017

@sdodson I saw a bunch of router errors, and did not investigate

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 10, 2017
@sdodson
Copy link
Member Author

sdodson commented Oct 10, 2017

@simo5 Added warning notification.

@sdodson sdodson merged commit 5915548 into openshift:release-3.6 Oct 10, 2017
@openshift-ci-robot
Copy link

@sdodson: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/upgrade b631de5 link /test upgrade

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.

@sdodson sdodson deleted the release-3.6 branch May 11, 2018 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sdodson @simo5 @openshift-ci-robot