Merge pull request kubernetes#16767 from ihmccreery/versioned-beta-fix

Manual merge to get into release-1.1 sooner: Fix beta versioning for build/push_ci_build.sh
nikhiljindal · Nov 4, 2015 · 1a59796 · 1a59796
2 parents aa1ccd0 + eaefc11
commit 1a59796
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/build/common.sh b/build/common.sh
@@ -374,12 +374,12 @@ function kube::release::parse_and_validate_release_version() {
 #    local -r version_minor="${BASH_REMATCH[2]}"
 #    local -r version_patch="${BASH_REMATCH[3]}"
 #    local -r version_prerelease="${BASH_REMATCH[4]}"
-#    local -r version_alpha_rev="${BASH_REMATCH[5]}"
+#    local -r version_prerelease_rev="${BASH_REMATCH[5]}"
 #    local -r version_build_info="${BASH_REMATCH[6]}"
 #    local -r version_commits="${BASH_REMATCH[7]}"
 function kube::release::parse_and_validate_ci_version() {
-  # Accept things like "v1.2.3-alpha.0.456+abcd789-dirty" or "v1.2.3-beta.456"
-  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]*))(\\.(0|[1-9][0-9]*)\\+[-0-9a-z]*)?$"
+  # Accept things like "v1.2.3-alpha.0.456+abcd789-dirty" or "v1.2.3-beta.0.456"
+  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]*)(\\.(0|[1-9][0-9]*)\\+[-0-9a-z]*)?$"
   local -r version="${1-}"
   [[ "${version}" =~ ${version_regex} ]] || {
     kube::log::error "Invalid ci version: '${version}'"
@@ -1216,7 +1216,7 @@ function kube::release::gcs::verify_ci_ge() {
   local -r version_minor="${BASH_REMATCH[2]}"
   local -r version_patch="${BASH_REMATCH[3]}"
   local -r version_prerelease="${BASH_REMATCH[4]}"
-  local -r version_alpha_rev="${BASH_REMATCH[5]}"
+  local -r version_prerelease_rev="${BASH_REMATCH[5]}"
   local -r version_commits="${BASH_REMATCH[7]}"
 
   local gcs_version
@@ -1230,7 +1230,7 @@ function kube::release::gcs::verify_ci_ge() {
     local -r gcs_version_minor="${BASH_REMATCH[2]}"
     local -r gcs_version_patch="${BASH_REMATCH[3]}"
     local -r gcs_version_prerelease="${BASH_REMATCH[4]}"
-    local -r gcs_version_alpha_rev="${BASH_REMATCH[5]}"
+    local -r gcs_version_prerelease_rev="${BASH_REMATCH[5]}"
     local -r gcs_version_commits="${BASH_REMATCH[7]}"
 
     local greater=true
@@ -1246,14 +1246,15 @@ 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
+    # Use lexicographic (instead of integer) comparison because
+    # version_prerelease is a string, ("alpha" or "beta")
+    elif [[ "${version_prerelease}" < "${gcs_version_prerelease}" ]]; then
       greater=false
-    elif [[ "${version_prerelease}" == "beta" && "${gcs_version_prerelease}" =~ alpha.* ]]; then
+    elif [[ "${version_prerelease}" > "${gcs_version_prerelease}" ]]; then
       : # fall out
-    # Check the alpha revision; if they are both beta, this is just comparing empty strings.
-    elif [[ "${version_alpha_rev}" -lt "${gcs_version_alpha_rev}" ]]; then
+    elif [[ "${version_prerelease_rev}" -lt "${gcs_version_prerelease_rev}" ]]; then
       greater=false
-    elif [[ "${version_alpha_rev}" -gt "${gcs_version_alpha_rev}" ]]; then
+    elif [[ "${version_prerelease_rev}" -gt "${gcs_version_prerelease_rev}" ]]; then
       : # fall out
     elif [[ "${version_patch}" -lt "${gcs_version_patch}" ]]; then
       greater=false