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

Disable the test-owners verify step until the merge conflicts are resolved #36096

Merged
merged 1 commit into from
Nov 3, 2016

Conversation

rmmh
Copy link
Contributor

@rmmh rmmh commented Nov 2, 2016

It's causing more pain than it's preventing currently. There should be some simpler ways to fix this.


This change is Reviewable

@rmmh rmmh assigned spxtr and ixdy Nov 2, 2016
@rmmh rmmh added retest-not-required release-note-none Denotes a PR that doesn't merit a release note. labels Nov 2, 2016
@spxtr
Copy link
Contributor

spxtr commented Nov 2, 2016

I would suggest still running it and reporting the output, but not failing when it fails.

…olved.

Fixes kubernetes#35850.

GitHub's merging doesn't support .gitattributes-- I verified this with
support. There may be a workaround with line padding or making the bot
do merges on its own, which is beneficial for custom merge conflict
resolution in general.
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 2, 2016
@rmmh
Copy link
Contributor Author

rmmh commented Nov 2, 2016

OK, changed.

@spxtr
Copy link
Contributor

spxtr commented Nov 2, 2016

/lgtm

@k8s-github-robot k8s-github-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 3, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GCE Node e2e failed for commit 57a152c. Full PR test history.

The magic incantation to run this job again is @k8s-bot node e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@rmmh
Copy link
Contributor Author

rmmh commented Nov 3, 2016

@k8s-bot node e2e test this

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 04a7457 into kubernetes:master Nov 3, 2016
@rmmh rmmh deleted the disable-verify-owners branch November 4, 2016 18:43
dims added a commit to dims/kubernetes that referenced this pull request Nov 11, 2016
Manual update to test_owners.csv, Add a update script that
simply calls the python script

Note that verify-test-owners.sh does not fail when things are out
of whack (details in PR kubernetes#36096)
dims added a commit to dims/kubernetes that referenced this pull request Nov 14, 2016
Manual update to test_owners.csv, Add a update script that
simply calls the python script

Note that verify-test-owners.sh does not fail when things are out
of whack (details in PR kubernetes#36096)
dims added a commit to dims/kubernetes that referenced this pull request Nov 16, 2016
Manual update to test_owners.csv, Add a update script that
simply calls the python script

Note that verify-test-owners.sh does not fail when things are out
of whack (details in PR kubernetes#36096)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants