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

Bug 1853298: [openstack/vsphere] Move dispatcher script to common #1773

Merged
merged 1 commit into from Jul 4, 2020
Merged

Bug 1853298: [openstack/vsphere] Move dispatcher script to common #1773

merged 1 commit into from Jul 4, 2020

Conversation

mandre
Copy link
Member

@mandre mandre commented Jun 2, 2020

This alignes OpenStack and vSphere platforms with with the BM one after
#1763 and #1765.

@mandre
Copy link
Member Author

mandre commented Jun 2, 2020

/test e2e-openstack
/test e2e-vsphere

/cc @patrickdillon for the vsphere change.

@mandre
Copy link
Member Author

mandre commented Jun 2, 2020

This PR is based on #1666, so we should really only be looking at the second commit here.

@Gal-Zaidman Gal-Zaidman mentioned this pull request Jun 2, 2020
Merged
@kikisdeliveryservice kikisdeliveryservice changed the title Move dispatcher script to common [openstack/vsphere] Move dispatcher script to common Jun 2, 2020
@kikisdeliveryservice
Copy link
Contributor

for vsphere review also:
/assign @jcpowermac

@jcpowermac
Copy link
Contributor

I can still review but please also assign...
/assign @patrickdillon

@kikisdeliveryservice
Copy link
Contributor

I can still review but please also assign...
/assign @patrickdillon

thanks for letting me know @jcpowermac ! 👍

@mandre
Copy link
Member Author

mandre commented Jun 3, 2020

/test e2e-openstack
/test e2e-vsphere

Rebased to remove the extra commit that has now merged to master.

@kikisdeliveryservice
Copy link
Contributor

/skip e2e-aws-scaleup-rhel7

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 7, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2020
@mandre
Move dispatcher script to common
b1453e9 
This aligned OpenStack and vSphere platforms with with the BM one after
openshift#1763 and openshift#1765.
@mandre
Copy link
Member Author

mandre commented Jun 29, 2020

/test e2e-openstack
/test e2e-vsphere

@mandre
Copy link
Member Author

mandre commented Jul 2, 2020

/retest

@mandre mandre changed the title [openstack/vsphere] Move dispatcher script to common Bug 1853298: [openstack/vsphere] Move dispatcher script to common Jul 2, 2020
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 2, 2020
@openshift-ci-robot
Copy link
Contributor

@mandre: This pull request references Bugzilla bug 1853298, which is invalid:

  • expected the bug to target the "4.6.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.

In response to this:

Bug 1853298: [openstack/vsphere] Move dispatcher script to common

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.

@mandre
Copy link
Member Author

mandre commented Jul 2, 2020

/test e2e-vsphere

@mandre
Copy link
Member Author

mandre commented Jul 2, 2020

/test e2e-openstack

@mandre mandre mentioned this pull request Jul 2, 2020
Closed
@mandre
Copy link
Member Author

mandre commented Jul 2, 2020

/bugzilla-refresh

@mandre
Copy link
Member Author

mandre commented Jul 2, 2020

This indeed fixes OpenStack CI, let's merge it.
@patrickdillon is there a known issue with vsphere CI?

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

18 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jul 4, 2020 •
edited

@mandre: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-vsphere b1453e9 link /test e2e-vsphere

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.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit a9b14f4 into openshift:master Jul 4, 2020
@openshift-ci-robot
Copy link
Contributor

@mandre: All pull requests linked via external trackers have merged: openshift/machine-config-operator#1773. Bugzilla bug 1853298 has been moved to the MODIFIED state.

In response to this:

Bug 1853298: [openstack/vsphere] Move dispatcher script to common

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.

@mandre
Copy link
Member Author

mandre commented Aug 19, 2020

/cherry-pick release-4.5

@openshift-cherrypick-robot
Copy link

@mandre: #1773 failed to apply on top of branch "release-4.5":

Applying: Move dispatcher script to common
Using index info to reconstruct a base tree...
M	templates/worker/00-worker/openstack/files/NetworkManager-resolv-prepender.yaml
M	templates/worker/00-worker/vsphere/files/NetworkManager-resolv-prepender.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): templates/worker/00-worker/vsphere/files/NetworkManager-resolv-prepender.yaml deleted in Move dispatcher script to common and modified in HEAD. Version HEAD of templates/worker/00-worker/vsphere/files/NetworkManager-resolv-prepender.yaml left in tree.
CONFLICT (modify/delete): templates/worker/00-worker/openstack/files/NetworkManager-resolv-prepender.yaml deleted in Move dispatcher script to common and modified in HEAD. Version HEAD of templates/worker/00-worker/openstack/files/NetworkManager-resolv-prepender.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move dispatcher script to common
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.5

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.

mandre added a commit to mandre/machine-config-operator that referenced this pull request Aug 19, 2020
@mandre
Bug 1870285: OpenStack: Ensure resolv.conf exists before running podman
bc067b9 
Manual backport of
openshift#1773 to
release-4.5 because of merge conflict. We can't share the prepender
script between control plane and compute nodes in OpenStack due to
dependency on the DNS VIP.

This basically boils down to porting
openshift#1765 to the
openstack worker prepender script that was forgotten in the initial
commit.

VShpere counterpart doesn't run podman and hence doesn't need the patch.
@mandre mandre mentioned this pull request Aug 19, 2020
Merged
vrutkovs pushed a commit to vrutkovs/machine-config-operator that referenced this pull request Aug 29, 2020
@mandre @vrutkovs
Bug 1870285: OpenStack: Ensure resolv.conf exists before running podman
e0e5f65 
Manual backport of
openshift#1773 to
release-4.5 because of merge conflict. We can't share the prepender
script between control plane and compute nodes in OpenStack due to
dependency on the DNS VIP.

This basically boils down to porting
openshift#1765 to the
openstack worker prepender script that was forgotten in the initial
commit.

VShpere counterpart doesn't run podman and hence doesn't need the patch.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ericavonb ericavonb Awaiting requested review from ericavonb

@iamemilio iamemilio Awaiting requested review from iamemilio

Assignees

@runcom runcom

@patrickdillon patrickdillon

@jcpowermac jcpowermac

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet