Enable prerelease push official release #16919
Conversation
| elif [[ "${version_patch}" -lt "${gcs_version_patch}" ]]; then | ||
| greater=false | ||
| elif [[ "${version_patch}" -gt "${gcs_version_patch}" ]]; then | ||
| : # fall out |
There was a problem hiding this comment.
These lines got accidentally copy-pasted in; they're identical to comparisons above, so should be removed.
There was a problem hiding this comment.
It's exactly this kind of copy-n-paste error that my comment above is aimed at :-)
There was a problem hiding this comment.
Good call. I expected that to be hideous, but I like the way it reads much more. Done.
|
Labelling this PR as size/M |
k8s-github-robot
added
the
size/M
| @@ -1148,6 +1151,9 @@ function kube::release::gcs::verify_release_files() { | |||
| # publish_file: the GCS location to look in | |||
| # Returns: | |||
| # If new version is greater than the GCS version | |||
| # | |||
| # TODO(16529): This should all be outside of build an in release, and should be | |||
| # refactored to reduce code duplication. | |||
There was a problem hiding this comment.
I considered doing this work in this PR, but decided that I wanted to keep this as low-impact as possible, since it needs to be cherrypicked. Once things stabilize in 1.1, #16529 can be targeted for 1.2.
|
GCE e2e test build/test passed for commit eada410195b88bd556b5f448f540f6db4e33b95d. |
|
@quinton-hoole Can I get a review on this? The fact that this wasn't in caused problems with the v1.1.2-beta.0 release this morning. Thank you! |
|
My apologies - I've been OOTO. Will review now. |
| function kube::release::parse_and_validate_release_version() { | ||
| local -r version_regex="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$" | ||
| local -r version_regex="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(-(beta|alpha)\\.(0|[1-9][0-9]*))?$" | ||
| local -r version="${1-}" | ||
| [[ "${version}" =~ ${version_regex} ]] || { | ||
| kube::log::error "Invalid release version: '${version}'" |
There was a problem hiding this comment.
I would suggest outputting the regex that was not matched here, to make the error message more informative. Debugging without that will involve wading through this code, unnecessarily.
|
GCE e2e build/test failed for commit 81e208060751b4e57404c3b8769200e98b5b65a3. |
|
@quinton-hoole PTAL. |
|
Labelling this PR as size/L |
k8s-github-robot
added
size/L
|
LGTM |
ghost
added
the
lgtm
|
GCE e2e test build/test passed for commit 75b9170bf3b2e63372916fcf7bffb25bc5dc85a4. |
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
|
GCE e2e test build/test passed for commit 75b9170bf3b2e63372916fcf7bffb25bc5dc85a4. |
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
mikedanese
removed
the
lgtm
|
Removing lgtm because this fixup commits should be squashed. Quinton, please ask for squash before applying lgtm per our squash guidelines: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md#when-to-retain-commits-and-when-to-squash because mergebot will trundle forward if lgtm is applied |
|
GCE e2e build/test failed for commit 75b9170bf3b2e63372916fcf7bffb25bc5dc85a4. |
|
This closes #17485. |
|
Rebased. @mikedanese PTAL. 😉 |
mikedanese
added
the
lgtm
|
Thanks! |
|
GCE e2e test build/test passed for commit 2fad9a1. |
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
|
GCE e2e test build/test passed for commit 2fad9a1. |
|
Automatic merge from submit-queue |
…cial-release Auto commit by PR queue bot
…6919-upstream-release-1.1 Auto commit by PR queue bot
…pick-of-#16919-upstream-release-1.1 Auto commit by PR queue bot
…pick-of-#16919-upstream-release-1.1 Auto commit by PR queue bot
This needs to be cherrypicked into 1.1, (and 1.0 if we want to do prerelease releases there, but I don't think we do).
Makes progress on #16773.