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

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

Merged
merged 3 commits into from
Oct 30, 2015
Merged

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

merged 3 commits into from
Oct 30, 2015

Conversation

j3ffml
Copy link
Contributor

@j3ffml j3ffml commented Oct 30, 2015

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

@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

#16551 take 2

@j3ffml j3ffml closed this Oct 30, 2015
@j3ffml j3ffml reopened this Oct 30, 2015
@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

@k8s-bot test this

@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
@j3ffml j3ffml force-pushed the automated-cherry-pick-of-#16287-#16546-#16565-upstream-release-1.1 branch from a2876fb to c3e60e5 Compare October 30, 2015 00:34
@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

@k8s-bot unit test this

@k8s-bot
Copy link

k8s-bot commented Oct 30, 2015

GCE e2e test build/test passed for commit a2876fb5bdb6dd8954f408124d6639d2b3c7547b.

j3ffml
j3ffml reviewed Oct 30, 2015
View reviewed changes
hack/jenkins/test-dockerized.sh

./hack/build-go.sh
godep go install ./...
./hack/travis/install-etcd.sh
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commenting here to note the cherrypick wasn't fully automated. This file has some differences between the one at HEAD to deal with moved script locations and branch-specific test env.

@k8s-bot
Copy link

k8s-bot commented Oct 30, 2015

GCE e2e test build/test passed for commit c3e60e541fb7d7aace614687e1b3be887c29ce09.

j3ffml added 2 commits October 30, 2015 10:32
@j3ffml
Modify jenkins unit/integration scripts to work on branches
dd41db5 
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
Remove -t in gotest-dockerized.sh
d4174ed
@j3ffml j3ffml force-pushed the automated-cherry-pick-of-#16287-#16546-#16565-upstream-release-1.1 branch from c3e60e5 to e8901d9 Compare October 30, 2015 17:32
@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.1 branch from e8901d9 to 3e2e0e5 Compare October 30, 2015 18:13
@k8s-bot
Copy link

k8s-bot commented Oct 30, 2015

GCE e2e test build/test passed for commit e8901d9cc21aef2293821cec576fdba7feaf816b.

@k8s-bot
Copy link

k8s-bot commented Oct 30, 2015

GCE e2e test build/test passed for commit 3e2e0e5.

@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

@k8s-bot unit test this

@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

LGTM

@k8s-bot unit test this please

@j3ffml
Copy link
Contributor Author

j3ffml commented Oct 30, 2015

I think the cni test failure is #14931

edit: s/is/was. Guess it's just flaky.

@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
Merge pull request #16566 from jlowdermilk/automated-cherry-pick-of-#…
2b3ff49 
…16287-#16546-#16565-upstream-release-1.1

Automated cherry pick of #16287 #16546 #16565
@a-robinson a-robinson merged commit 2b3ff49 into kubernetes:release-1.1 Oct 30, 2015
@j3ffml j3ffml deleted the automated-cherry-pick-of-#16287-#16546-#16565-upstream-release-1.1 branch November 17, 2015 18:49
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@a-robinson
Merge pull request kubernetes#16566 from jlowdermilk/automated-cherry…
dc98871 
…-pick-of-#16287-kubernetes#16546-kubernetes#16565-upstream-release-1.1

Automated cherry pick of kubernetes#16287 kubernetes#16546 kubernetes#16565
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@a-robinson
Merge pull request kubernetes#16566 from jlowdermilk/automated-cherry…
f4095d8 
…-pick-of-#16287-kubernetes#16546-kubernetes#16565-upstream-release-1.1

Automated cherry pick of kubernetes#16287 kubernetes#16546 kubernetes#16565
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ixdy ixdy

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@j3ffml @k8s-github-robot @k8s-bot @ixdy @a-robinson @k8s-teamcity-mesosphere @googlebot