Skip to content

Conversation

@runcom
Copy link
Member

@runcom runcom commented Oct 18, 2019

What #1177 had inadvertently regressed is that our MCs aren't rolled back anymore. This was sort of fine till the BZ came in, which exposed another bug we had. Basically, the code was adding duplicate and triplicates of common files all over. If you pair that with #1177, you'll get the bug in the title.

@openshift-ci-robot
Copy link
Contributor

@runcom: This pull request references Bugzilla bug 1762868, which is invalid:

  • expected the bug to target the "4.3.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1762868: version ControllerConfig and fix common templates in MCs

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.

@openshift-ci-robot openshift-ci-robot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 18, 2019
@runcom
Copy link
Member Author

runcom commented Oct 18, 2019

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Oct 18, 2019
@openshift-ci-robot
Copy link
Contributor

@runcom: This pull request references Bugzilla bug 1762868, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

/bugzilla refresh

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.

@runcom
Copy link
Member Author

runcom commented Oct 18, 2019

/cherrypick release-4.2

@openshift-cherrypick-robot

@runcom: once the present PR merges, I will cherry-pick it on top of release-4.2 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.2

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.

@runcom
Copy link
Member Author

runcom commented Oct 18, 2019

/hold

@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 18, 2019
@runcom runcom force-pushed the cc-versioninig branch 2 times, most recently from 9b71d01 to b6bd360 Compare October 18, 2019 13:49
@cgwalters
Copy link
Member

/approve

@cgwalters
Copy link
Member

Sorry about the common template regression; patch on that looks OK. I feel like this code could use a broader cleanup (and we could use some asserts that we're not generating duplicate files since that's a hard error in Ignition spec 3) but let's do the simple fix first!

@cgwalters
Copy link
Member

And to help me understand - in order to fix the bug, we need to backport this all the way to 4.1, right?

@runcom
Copy link
Member Author

runcom commented Oct 18, 2019

And to help me understand - in order to fix the bug, we need to backport this all the way to 4.1, right?

I think 4.1 can live w/o the controllerconfig version fix (as it will compare against the empty string and still be correct)

As for the other common template fix, yeah, need proper backport till 4.1 but not as urgent maybe

@runcom
Copy link
Member Author

runcom commented Oct 18, 2019

/retest

@openshift-ci-robot
Copy link
Contributor

@runcom: This pull request references Bugzilla bug 1762868, which is valid.

Details

In response to this:

Bug 1762868: version ControllerConfig and fix common templates in MCs

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.

@runcom runcom changed the title Bug 1762868: version ControllerConfig and fix common templates in MCs Bug 1762868: revert #1177 and fix common templates in MCs Oct 20, 2019
@runcom
Copy link
Member Author

runcom commented Oct 20, 2019

Good to go now with the revert to #1177 which is also needed for 4.2 (#1182) @mrunalp PTAL

/cherrypick release-4.2

@openshift-cherrypick-robot

@runcom: once the present PR merges, I will cherry-pick it on top of release-4.2 in a new PR and assign it to you.

Details

In response to this:

Good to go now with the revert to #1177 which is also needed for 4.2 (#1182) @mrunalp PTAL

/cherrypick release-4.2

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.

@runcom
Copy link
Member Author

runcom commented Oct 20, 2019

Good to go now with the revert to #1177 which is also needed for 4.2 (#1182) @mrunalp PTAL

/cherrypick release-4.2

4.2 BZ is already here https://bugzilla.redhat.com/show_bug.cgi?id=1763205 for the cherry-pick

@runcom
Copy link
Member Author

runcom commented Oct 21, 2019

/hold cancel
/skip

Good to go

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 21, 2019
@mrunalp
Copy link
Member

mrunalp commented Oct 21, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, mrunalp, runcom

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 21, 2019

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

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 fd51c74 link /test e2e-aws-scaleup-rhel7

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.

Details

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.

@mrunalp
Copy link
Member

mrunalp commented Oct 21, 2019

/test e2e-aws

@openshift-merge-robot openshift-merge-robot merged commit ffc5b54 into openshift:master Oct 21, 2019
@openshift-ci-robot
Copy link
Contributor

@runcom: All pull requests linked via external trackers have merged. Bugzilla bug 1762868 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1762868: revert #1177 and fix common templates in MCs

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.

@openshift-cherrypick-robot

@runcom: new pull request created: #1202

Details

In response to this:

Good to go now with the revert to #1177 which is also needed for 4.2 (#1182) @mrunalp PTAL

/cherrypick release-4.2

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.

@runcom runcom deleted the cc-versioninig branch October 22, 2019 06:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants