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

Use shasum if sha1sum doesn't exist in the path #37362

Merged
merged 1 commit into from
Nov 23, 2016

Conversation

roberthbailey
Copy link
Contributor

@roberthbailey roberthbailey commented Nov 23, 2016

What this PR does / why we need it: bug fix for running upgrade.sh from a mac

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #37355


This change is Reviewable

@roberthbailey roberthbailey added the release-note-none Denotes a PR that doesn't merit a release note. label Nov 23, 2016
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 23, 2016
@roberthbailey
Copy link
Contributor Author

FYI, I still need to manually test this on both mac and linux, so please don't lgtm yet.

@roberthbailey roberthbailey added this to the v1.5 milestone Nov 23, 2016
@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 23, 2016
@eparis
Copy link
Contributor

eparis commented Nov 23, 2016

it does LGTM. Feel free to self label when you are confident.

@roberthbailey
Copy link
Contributor Author

roberthbailey commented Nov 23, 2016

I ran the following on both a mac and linux machine:

$ git co upstream/release-1.4
$ make clean; make quick-release
$ ./cluster/kube-up.sh
$ git fetch upstream pull/37362/head:test_pull_37362
$ git co test_pull_37362
$ ./cluster/gce/upgrade.sh -M v1.5.0-beta.1

and got to the endless dots (since #37358 hasn't yet been merged) until I applied the manual fix described in #37257 (comment).

I found a minor issue on the mac side, where quoting the new variable causes bash to try and execute "shasum -a1" instead of just "shasum" passing "-a1" as an argument so I've unquoted the variable in the pipe chains and re-pushed my branch.

@roberthbailey
Copy link
Contributor Author

Re-tested on linux after pushing the new branch and now both mac & linux appear to be working. Self-applying the lgtm label.

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

Automatic merge from submit-queue

@jessfraz
Copy link
Contributor

jessfraz commented Dec 1, 2016

cherry-picked in #37864

@jessfraz jessfraz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Dec 1, 2016
jessfraz added a commit that referenced this pull request Dec 2, 2016
@k8s-cherrypick-bot
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

upgrade.sh doesn't work on mac due to inline use of sha1sum
6 participants