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.

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

[1506750] Ensure proper hostname check override #6817

Merged
merged 1 commit into from
Jan 23, 2018

Conversation

mtnbikenc
Copy link
Member

@mtnbikenc mtnbikenc self-assigned this Jan 22, 2018
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 22, 2018
@mtnbikenc
Copy link
Member Author

/test tox

@sdodson
Copy link
Member

sdodson commented Jan 22, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2018
@sdodson
Copy link
Member

sdodson commented Jan 22, 2018

/retest

@mtnbikenc
Copy link
Member Author

/test install

@mtnbikenc
Copy link
Member Author

bot test this please

@mtnbikenc
Copy link
Member Author

bot, retest this please

@mtnbikenc
Copy link
Member Author

/test install

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 2631694 into openshift:master Jan 23, 2018
@mtnbikenc mtnbikenc deleted the fix-1506750 branch January 23, 2018 20:31
@openshift-ci-robot
Copy link

@mtnbikenc: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/gcp c7f845f link /test gcp
ci/openshift-jenkins/extended_conformance_install_crio c7f845f link /test crio

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.

@mtnbikenc
Copy link
Member Author

/cherrypick release-3.7

@openshift-cherrypick-robot

@mtnbikenc: #6817 failed to apply on top of branch "release-3.7":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	inventory/hosts.example
A	playbooks/init/validate_hostnames.yml
A	playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
M	utils/src/ooinstall/openshift_ansible.py
Falling back to patching base and 3-way merge...
Auto-merging utils/src/ooinstall/openshift_ansible.py
CONFLICT (modify/delete): playbooks/openstack/sample-inventory/group_vars/OSEv3.yml deleted in HEAD and modified in Ensure proper hostname check override. Version Ensure proper hostname check override of playbooks/openstack/sample-inventory/group_vars/OSEv3.yml left in tree.
CONFLICT (modify/delete): playbooks/init/validate_hostnames.yml deleted in HEAD and modified in Ensure proper hostname check override. Version Ensure proper hostname check override of playbooks/init/validate_hostnames.yml left in tree.
Auto-merging inventory/byo/hosts.example
Patch failed at 0001 Ensure proper hostname check override

In response to this:

/cherrypick release-3.7

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.

mtnbikenc added a commit to mtnbikenc/openshift-ansible that referenced this pull request Jan 25, 2018
openshift-merge-robot added a commit that referenced this pull request Jan 26, 2018
irozzo-1A pushed a commit to irozzo-1A/openshift-ansible that referenced this pull request Mar 2, 2018
mjudeikis pushed a commit to mjudeikis/openshift-ansible that referenced this pull request Mar 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants