From 652a8a6a44a5cb75b7667dfcd721dc5414a5bd22 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 5 Nov 2015 11:15:58 -0800 Subject: [PATCH 1/3] WIP release process fixes --- release/build-official-release.sh | 4 ++-- release/cut-official-release.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/build-official-release.sh b/release/build-official-release.sh index d539cdb0499..f6d1269780e 100755 --- a/release/build-official-release.sh +++ b/release/build-official-release.sh @@ -45,13 +45,13 @@ declare -r KUBE_GITHUB="https://github.com/kubernetes/kubernetes.git" declare -r KUBE_RELEASE_VERSION=${1-} declare -r KUBE_RELEASE_UMASK=${KUBE_RELEASE_UMASK:-022} -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]*))?$" +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]*))?$" [[ ${KUBE_RELEASE_VERSION} =~ ${VERSION_REGEX} ]] || { echo "!!! You must specify the version you are releasing in the form of '${VERSION_REGEX}'" >&2 exit 1 } -declare -r KUBE_BUILD_DIR="/tmp/kubernetes-release-${KUBE_RELEASE_VERSION}-$(date +%s)" +declare -r KUBE_BUILD_DIR=$(mktemp -d "/tmp/kubernetes-build-release-${KUBE_RELEASE_VERSION}-XXXXXXX") # Set the default umask for the release. This ensures consistency # across our release builds. diff --git a/release/cut-official-release.sh b/release/cut-official-release.sh index 39385664770..bf66df7cbde 100755 --- a/release/cut-official-release.sh +++ b/release/cut-official-release.sh @@ -94,10 +94,10 @@ function main() { umask "${release_umask}" local -r github="https://github.com/kubernetes/kubernetes.git" - declare -r DIR="/tmp/kubernetes-${release_type}-release-${new_version}-$(date +%s)" + declare -r DIR=$(mktemp -d "/tmp/kubernetes-${release_type}-release-${new_version}-XXXXXXX") # Start a tmp file that will hold instructions for the user. - declare -r INSTRUCTIONS="/tmp/kubernetes-${release_type}-release-${new_version}-$(date +%s)-instructions" + declare -r INSTRUCTIONS=$(mktemp "/tmp/kubernetes-${release_type}-release-${new_version}-instructions-XXXXXXX") if $DRY_RUN; then cat > "${INSTRUCTIONS}" <<- EOM Success on dry run! Do From 849cfaaf093c87b983b3dc02f13939f2c86dfb31 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Tue, 3 Nov 2015 14:29:09 -0800 Subject: [PATCH 2/3] Fixes to release scripts --- release/cut-official-release.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/release/cut-official-release.sh b/release/cut-official-release.sh index bf66df7cbde..d2f8ec491b0 100755 --- a/release/cut-official-release.sh +++ b/release/cut-official-release.sh @@ -24,7 +24,7 @@ set -o pipefail # Sets DIR, INSTRUCTIONS function main() { # Parse arguments - if [[ "$#" -ne 2 ]]; then + if [[ "$#" -ne 2 && "$#" -ne 3 ]]; then usage exit 1 fi @@ -93,7 +93,7 @@ function main() { local -r release_umask=${release_umask:-022} umask "${release_umask}" - local -r github="https://github.com/kubernetes/kubernetes.git" + local -r github="git@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. @@ -340,10 +340,9 @@ function rev-version-and-commit() { function git-push() { local -r object="${1}" if $DRY_RUN; then - echo "Dry run: would have done git push ${object}" + echo "Dry run: would have done git push origin ${object}" else - echo "NOT A DRY RUN: you don't really want to git push ${object}, do you?" - # git push "${object}" + git push origin "${object}" fi } From 27770952a79ed1ae32152f52111f67144738fd55 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 5 Nov 2015 11:37:02 -0800 Subject: [PATCH 3/3] Message to cut-n-paste instructions --- release/build-official-release.sh | 4 ++-- release/cut-official-release.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/release/build-official-release.sh b/release/build-official-release.sh index f6d1269780e..1e8f982e5ec 100755 --- a/release/build-official-release.sh +++ b/release/build-official-release.sh @@ -90,8 +90,8 @@ SHA1=$(sha1 "${KUBE_BUILD_DIR}/kubernetes.tar.gz") cat <<- EOM -Success! You must now do the following: (you may want to cut - and paste these instructions elsewhere, step 1 can be spammy) +Success! You must now do the following (you may want to cut and paste these +instructions elsewhere): 1) (cd ${KUBE_BUILD_DIR}; build/push-official-release.sh ${KUBE_RELEASE_VERSION}) 2) Go to https://github.com/GoogleCloudPlatform/kubernetes/releases diff --git a/release/cut-official-release.sh b/release/cut-official-release.sh index d2f8ec491b0..50770de73ec 100755 --- a/release/cut-official-release.sh +++ b/release/cut-official-release.sh @@ -111,7 +111,8 @@ You would now do the following, if not a dry run: EOM else cat > "${INSTRUCTIONS}" <<- EOM -Success! You must now do the following: +Success! You must now do the following (you may want to cut and paste these +instructions elsewhere): EOM fi