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

Automated cherry pick of #16287 #16546 #16565 #16568

Conversation

j3ffml
Copy link
Contributor

@j3ffml j3ffml commented Oct 30, 2015

Cherry pick of #16287 #16546 #16565 on release-1.0.

Also add a makefile. This will need a cherrypick onto 1.0,1.1
with edits to hack/jenkins/test-dockerized.sh to run branch-specific
test scripts.

Also had to modify hack/verify-api-reference.sh to handle volume mount
path peculiarity when doing `docker run -v` inside a container started
with `docker run -v`. See associated comment in
hack/jenkins/test-dockerized.sh
@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

@k8s-bot unit test this

@k8s-github-robot
Copy link

Labelling this PR as size/L

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 30, 2015
@k8s-bot
Copy link

k8s-bot commented Oct 30, 2015

GCE e2e test build/test passed for commit a158769f5de39ccf6c999b7fa98db21b0f1f5d09.

@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

@k8s-bot unit test this

2 similar comments
@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

@k8s-bot unit test this

@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

@k8s-bot unit test this

@j3ffml j3ffml force-pushed the automated-cherry-pick-of-#16287-#16546-#16565-upstream-release-1.0 branch from a158769 to fab9ec5 Compare October 30, 2015 18:13
@k8s-bot
Copy link

k8s-bot commented Oct 30, 2015

GCE e2e test build/test passed for commit fab9ec5.

@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

@k8s-bot unit test this

@ixdy
Copy link
Member

ixdy commented Oct 30, 2015

LGTM

@ixdy ixdy added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 30, 2015
@ixdy
Copy link
Member

ixdy commented Oct 30, 2015

Jenkins unit/integration test will fail until #16622 is merged.

@ixdy
Copy link
Member

ixdy commented Oct 30, 2015

@k8s-bot unit test this please

(I pointed the configuration to download upload-to-gcs.sh from my branch.)

@a-robinson
Copy link
Contributor

Manual merge while merge-bot is down due to a single flake from a known issue.

a-robinson added a commit that referenced this pull request Oct 30, 2015
@a-robinson a-robinson merged commit a7ddccb into kubernetes:release-1.0 Oct 30, 2015
@j3ffml j3ffml deleted the automated-cherry-pick-of-#16287-#16546-#16565-upstream-release-1.0 branch November 17, 2015 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/test-infra lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants