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

Change push-ci-build.sh to push-build.sh. #32235

Merged
merged 1 commit into from
Sep 8, 2016

Conversation

david-mcmahon
Copy link
Contributor

@david-mcmahon david-mcmahon commented Sep 7, 2016

This change is Reviewable

@k8s-github-robot k8s-github-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Sep 7, 2016
@ixdy
Copy link
Member

ixdy commented Sep 7, 2016

How do we coordinate this with kubernetes/release#66?

@david-mcmahon
Copy link
Contributor Author

As build.sh conveniently clones it right before using it, it's safe to get the companion change in right before this one goes in. Admittedly this is a bit hard to do with the SQ, but maybe @k8s-oncall could help.

@david-mcmahon david-mcmahon added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 7, 2016
@david-mcmahon
Copy link
Contributor Author

@k8s-bot retest issue #UNKNOWN

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 7, 2016
@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 7, 2016
@david-mcmahon
Copy link
Contributor Author

@rmmh @ixdy @spxtr
I'm not sure what's going on with this PR failing. Is it some fallout from something you are doing or might it have something to do with the state of the repo on the test machine and that fact that this PR contains a renamed file? I'm grasping here b/c I'm not sure what's going on.

"Exiting..." >&2
exit 1
if [[ ! -x ${push_build} ]]; then
# TODO: Remove/Restore this with the full deprecation PR
Copy link
Member

Choose a reason for hiding this comment

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

with this new logic, this shouldn't be an if/else, just an if.

@ixdy
Copy link
Member

ixdy commented Sep 7, 2016

GitHub still thinks there are merge conflicts, which is probably why this is failing.

@david-mcmahon david-mcmahon force-pushed the push-build branch 2 times, most recently from e07fe56 to b3892e1 Compare September 7, 2016 23:49
@david-mcmahon david-mcmahon removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 7, 2016
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 7, 2016
@ixdy
Copy link
Member

ixdy commented Sep 8, 2016

LGTM

@k8s-bot test this, issue #27462

@ixdy ixdy added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 8, 2016
@k8s-bot
Copy link

k8s-bot commented Sep 8, 2016

GCE e2e build/test passed for commit 92ddc22.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 93f8b87 into kubernetes:master Sep 8, 2016
k8s-github-robot pushed a commit that referenced this pull request Oct 27, 2016
…32235-#34359-#35233-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #32013 #32235 #34359 #35233

Cherry pick of #32013 #32235 #34359 #35233 on release-1.4.

#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
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…f-#32013-kubernetes#32235-kubernetes#34359-kubernetes#35233-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of kubernetes#32013 kubernetes#32235 kubernetes#34359 kubernetes#35233

Cherry pick of kubernetes#32013 kubernetes#32235 kubernetes#34359 kubernetes#35233 on release-1.4.

kubernetes#32013: Call push-ci-build.sh from the kubernetes/release repo.
kubernetes#32235: Change push-ci-build.sh to push-build.sh and some cleanup.
kubernetes#34359: Add support for adding a suffix to the GCS upload dir in
kubernetes#35233: Delete some old, dead release code
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/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.

6 participants