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 #28922 #29892 #30182 #31025 #32013 #32235 #34359 #35233 #35458

Merged
merged 8 commits into from
Oct 25, 2016
Merged

Automated cherry pick of #28922 #29892 #30182 #31025 #32013 #32235 #34359 #35233 #35458

merged 8 commits into from
Oct 25, 2016

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Oct 24, 2016 •
edited by k8s-oncall
Loading

Cherry pick of #28922 #29892 #30182 #31025 #32013 #32235 #34359 #35233 on release-1.3.
#28922: Add RELEASE_INFRA_PUSH related code to support pushes from
#29892: Clone kubernetes/release into something other than /release
#30182: Add SET_NOMOCK_FLAG handling.
#31025: Fix unbound variable issue (set -e).
#32013: Call push-ci-build.sh from the kubernetes/release repo.
#32235: Change push-ci-build.sh to push-build.sh and some cleanup.
#34359: Add support for adding a suffix to the GCS upload dir in
#35233: Delete some old, dead release code

This change is Reviewable

@ixdy
Copy link
Member Author

ixdy commented Oct 24, 2016

This is basically "use kubernetes/release/push-build.sh instead of in-tree push" for Jenkins only. It should be safe.

@ixdy
Copy link
Member Author

ixdy commented Oct 24, 2016

cc @fejta @david-mcmahon

@ixdy ixdy added this to the v1.3 milestone Oct 24, 2016
@k8s-github-robot k8s-github-robot assigned fejta and unassigned maisem Oct 24, 2016
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Oct 24, 2016
@david-mcmahon
Copy link
Contributor

LGTM

@ixdy ixdy added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Oct 24, 2016
@ixdy ixdy mentioned this pull request Oct 24, 2016
Merged
@fejta
Copy link
Contributor

fejta commented Oct 24, 2016

Any thoughts on the kubemark error?

@ixdy
Copy link
Member Author

ixdy commented Oct 24, 2016

@fejta that's broken for a different reason, I think - there's a build from 2 weeks ago with the same error: https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/pr-logs/pull/34281/kubernetes-pull-build-test-kubemark-e2e-gce/2560/

2016/10/07 01:01:44 e2e.go:669: Running: Start Kubemark
Copying kubemark to ./test/kubemark/../../cluster/kubemark/../../cluster/gce/../../cluster/gce/../../cluster/../cluster/images/kubemark
tar (child): kubernetes-server-linux-amd64.tar.gz: Cannot open: No such file or directory
tar (child): Error is not recoverable: exiting now
tar: Child returned status 2
tar: Error is not recoverable: exiting now

@ixdy
Copy link
Member Author

ixdy commented Oct 24, 2016

see also #33409 (comment)

@fejta
Copy link
Contributor

fejta commented Oct 24, 2016

@k8s-bot kubemark e2e test this

@fejta
Copy link
Contributor

fejta commented Oct 24, 2016

LGTM

@fejta
Copy link
Contributor

fejta commented Oct 24, 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 Oct 24, 2016
This was referenced Oct 25, 2016
Merged
Merged
Merged
@fabioy fabioy added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Oct 25, 2016
@ixdy
Copy link
Member Author

ixdy commented Oct 25, 2016

@k8s-bot test this please

@ixdy ixdy added the priority/backlog Higher priority than priority/awaiting-more-evidence. label Oct 25, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins Kubemark GCE e2e failed for commit 0b644ee. Full PR test history.

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

@ixdy
Copy link
Member Author

ixdy commented Oct 25, 2016

Jenkins Kubemark GCE e2e is broken on release-1.3, so I'm going to merge manually.

@ixdy ixdy merged commit 9e735dd into kubernetes:release-1.3 Oct 25, 2016
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.3" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

This was referenced Oct 25, 2016
Merged
Merged
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@ixdy
Merge pull request kubernetes#35458 from ixdy/automated-cherry-pick-o…
015cbf0 
…f-#28922-kubernetes#29892-kubernetes#30182-kubernetes#31025-kubernetes#32013-kubernetes#32235-kubernetes#34359-kubernetes#35233-upstream-release-1.3

Automated cherry pick of kubernetes#28922 kubernetes#29892 kubernetes#30182 kubernetes#31025 kubernetes#32013 kubernetes#32235 kubernetes#34359 kubernetes#35233
@ixdy ixdy deleted the automated-cherry-pick-of-#28922-#29892-#30182-#31025-#32013-#32235-#34359-#35233-upstream-release-1.3 branch May 15, 2018 23:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@fejta fejta

@maisem maisem

@fabioy fabioy

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
9 participants
@ixdy @david-mcmahon @fejta @k8s-ci-robot @k8s-cherrypick-bot @maisem @googlebot @fabioy @k8s-github-robot