From eb4be739d58d8d1122c02d8b980553d61956d825 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Wed, 18 Nov 2015 16:03:04 -0800 Subject: [PATCH] Fix cut-official-release to deal with versioned beta releases properly --- release/cut-official-release.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release/cut-official-release.sh b/release/cut-official-release.sh index d477367f694..e2ba6c4b9b5 100755 --- a/release/cut-official-release.sh +++ b/release/cut-official-release.sh @@ -93,7 +93,7 @@ function main() { local -r release_umask=${release_umask:-022} umask "${release_umask}" - local -r github="git@github.com:kubernetes/kubernetes.git" + local -r github="https://github.com/kubernetes/kubernetes.git" declare -r DIR=$(mktemp -d "/tmp/kubernetes-${release_type}-release-${new_version}-XXXXXXX") # Start a tmp file that will hold instructions for the user. @@ -148,8 +148,8 @@ EOM git-push ${release_branch} elif [[ "${release_type}" == 'official' ]]; then local -r release_branch="release-${version_major}.${version_minor}" - local -r beta_version="v${version_major}.${version_minor}.$((${version_patch}+1))-beta" - local -r ancestor="${new_version}-beta" + local -r beta_version="v${version_major}.${version_minor}.$((${version_patch}+1))-beta.0" + local -r ancestor="${new_version}-beta.0" git checkout "${release_branch}" verify-at-git-commit "${git_commit}" @@ -162,7 +162,7 @@ EOM else # [[ "${release_type}" == 'series' ]] local -r release_branch="release-${version_major}.${version_minor}" local -r alpha_version="v${version_major}.$((${version_minor}+1)).0-alpha.0" - local -r beta_version="v${version_major}.${version_minor}.0-beta" + local -r beta_version="v${version_major}.${version_minor}.0-beta.0" # NOTE: We check the second alpha version, ...-alpha.1, because ...-alpha.0 # is the branch point for the previous release cycle, so could provide a # false positive if we accidentally try to release off of the old release