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

Fix beta versioning for build/push_ci_build.sh #16767

Merged
merged 1 commit into from
Nov 4, 2015
Merged

Fix beta versioning for build/push_ci_build.sh #16767

merged 1 commit into from
Nov 4, 2015

Conversation

ikehz
Copy link
Contributor

@ikehz ikehz commented Nov 4, 2015

@ixdy This should fix the release-1.1 builder, (once cherrypicked into release-1.1; unfortunately, that means un-freezing release-1.1.)

@quinton-hoole @bgrant0607 FYI.

@ikehz ikehz added area/build-release area/release-eng Issues or PRs related to the Release Engineering subproject labels Nov 4, 2015
@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 4, 2015
@k8s-bot
Copy link

k8s-bot commented Nov 4, 2015

GCE e2e build/test failed for commit 18f5fc373b6b8b728b7ed34e1022dd493695f026.

@ikehz
Copy link
Contributor Author

ikehz commented Nov 4, 2015

@ixdy why did these fail? I'm not clear on either failure.

@ikehz
Copy link
Contributor Author

ikehz commented Nov 4, 2015

@k8s-bot test this please

@ikehz
Copy link
Contributor Author

ikehz commented Nov 4, 2015

@k8s-bot unit test this please

@ixdy
Copy link
Member

ixdy commented Nov 4, 2015

I was trying to set up an additional build machine for the pull Jenkins. It did not go well.

@k8s-bot
Copy link

k8s-bot commented Nov 4, 2015

GCE e2e build/test failed for commit 18f5fc373b6b8b728b7ed34e1022dd493695f026.

@ikehz
Copy link
Contributor Author

ikehz commented Nov 4, 2015

@k8s-bot test this please

@ikehz
Copy link
Contributor Author

ikehz commented Nov 4, 2015

Fixes #16787.

@ikehz
Copy link
Contributor Author

ikehz commented Nov 4, 2015

@zmerlynn Can I get a quick review on this? The 1.1 build is failing due to versioning problems, so we should get this in asap.

@ikehz ikehz added this to the v1.1 milestone Nov 4, 2015
@k8s-bot
Copy link

k8s-bot commented Nov 4, 2015

GCE e2e test build/test passed for commit 18f5fc373b6b8b728b7ed34e1022dd493695f026.

@@ -1246,14 +1246,13 @@ function kube::release::gcs::verify_ci_ge() {
greater=false
elif [[ "${version_patch}" -gt "${gcs_version_patch}" ]]; then
: # fall out
elif [[ "${version_prerelease}" =~ alpha.* && "${gcs_version_prerelease}" == "beta" ]]; then
elif [[ "${version_prerelease}" < "${gcs_version_prerelease}" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

All other comparisons in this file use -lt.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct. This phrase is lexicographically comparing strings, not integers. -lt is for ints, < is for strings.

@zmerlynn
Copy link
Member

zmerlynn commented Nov 4, 2015

@k8s-bot unit test this

@zmerlynn zmerlynn assigned zmerlynn and unassigned ixdy Nov 4, 2015
@zmerlynn zmerlynn added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 4, 2015
@zmerlynn
Copy link
Member

zmerlynn commented Nov 4, 2015

LGTM

@k8s-github-robot
Copy link

PR changed after LGTM, removing LGTM.

@k8s-github-robot
Copy link

Labelling this PR as size/XL

@k8s-github-robot k8s-github-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 4, 2015
@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 4, 2015
@k8s-bot
Copy link

k8s-bot commented Nov 4, 2015

GCE e2e build/test failed for commit fdab27ffc0b7d8716f31c403f3ff7a6c361c5bf4.

@zmerlynn zmerlynn added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 4, 2015
@k8s-bot
Copy link

k8s-bot commented Nov 4, 2015

GCE e2e test build/test passed for commit eaefc11.

ikehz pushed a commit that referenced this pull request Nov 4, 2015
Manual merge to get into release-1.1 sooner: Fix beta versioning for build/push_ci_build.sh
@ikehz ikehz merged commit 1a59796 into kubernetes:master Nov 4, 2015
@ikehz ikehz deleted the versioned-beta-fix branch November 4, 2015 22:51
ikehz referenced this pull request Nov 4, 2015
…6767-upstream-release-1.1

Fix beta versioning for build/push_ci_build.sh
shyamjvs referenced this pull request in shyamjvs/kubernetes Dec 1, 2016
…pick-of-#16767-upstream-release-1.1

Fix beta versioning for build/push_ci_build.sh
shouhong referenced this pull request in shouhong/kubernetes Feb 14, 2017
…pick-of-#16767-upstream-release-1.1

Fix beta versioning for build/push_ci_build.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/build-release area/release-eng Issues or PRs related to the Release Engineering subproject lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

8 participants