From 1b10eb02d934ded951f6ac9c061946bda47f23ba Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 2 Feb 2022 12:31:07 -0800 Subject: [PATCH] updated release script to push v2 releases files --- deploy/minikube/schema_check.go | 4 +++- hack/jenkins/release_update_releases_json.go | 2 +- hack/jenkins/release_update_releases_json.sh | 10 ++++++---- pkg/minikube/notify/constants.go | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/deploy/minikube/schema_check.go b/deploy/minikube/schema_check.go index cc6b517769..cff48dd5c0 100644 --- a/deploy/minikube/schema_check.go +++ b/deploy/minikube/schema_check.go @@ -28,7 +28,9 @@ import ( func main() { validateSchema("deploy/minikube/schema.json", "deploy/minikube/releases.json") + validateSchema("deploy/minikube/schema.json", "deploy/minikube/releases-beta.json") validateSchema("deploy/minikube/schema-v2.json", "deploy/minikube/releases-v2.json") + validateSchema("deploy/minikube/schema-v2.json", "deploy/minikube/releases-beta-v2.json") os.Exit(0) } @@ -49,7 +51,7 @@ func validateSchema(schemaPathString, docPathString string) { } if err = sch.Validate(v); err != nil { - log.Fatalf("%#v", err) + fmt.Printf("The document %s is invalid, see errors:\n%#v", docPathString, err) } fmt.Printf("The document %s is valid\n", docPathString) diff --git a/hack/jenkins/release_update_releases_json.go b/hack/jenkins/release_update_releases_json.go index 99a9a2330c..577ec03374 100644 --- a/hack/jenkins/release_update_releases_json.go +++ b/hack/jenkins/release_update_releases_json.go @@ -59,7 +59,7 @@ func main() { flag.Parse() if *releasesFile == "" || *version == "" { - fmt.Println("The releaeses-file & version flags are required and cannot be empty") + fmt.Println("The releases-file & version flags are required and cannot be empty") flag.PrintDefaults() os.Exit(1) } diff --git a/hack/jenkins/release_update_releases_json.sh b/hack/jenkins/release_update_releases_json.sh index d15edc1e35..ea17bd31fb 100755 --- a/hack/jenkins/release_update_releases_json.sh +++ b/hack/jenkins/release_update_releases_json.sh @@ -44,15 +44,16 @@ if ! [[ "${VERSION_BUILD}" =~ ^[0-9]+$ ]]; then go run "${DIR}/release_update_releases_json.go" --releases-file deploy/minikube/releases-beta-v2.json --version "$TAGNAME" git add -A - git commit -m "Update releases-beta.json to include ${TAGNAME}" + git commit -m "Update releases-beta.json & releases-beta-v2.json to include ${TAGNAME}" git remote add minikube-bot git@github.com:minikube-bot/minikube.git git push -f minikube-bot jenkins-releases.json-${TAGNAME} # Send PR from minikube-bot/minikube to kubernetes/minikube - curl -X POST -u minikube-bot:${BOT_PASSWORD} -k -d "{\"title\": \"update releases-beta.json to include ${TAGNAME}\",\"head\": \"minikube-bot:jenkins-releases.json-${TAGNAME}\",\"base\": \"master\"}" https://api.github.com/repos/kubernetes/minikube/pulls + curl -X POST -u minikube-bot:${BOT_PASSWORD} -k -d "{\"title\": \"update releases-beta.json & releases-beta-v2.json to include ${TAGNAME}\",\"head\": \"minikube-bot:jenkins-releases.json-${TAGNAME}\",\"base\": \"master\"}" https://api.github.com/repos/kubernetes/minikube/pulls # Upload file to GCS so that minikube can see the new version gsutil cp deploy/minikube/releases-beta.json gs://minikube/releases-beta.json + gsutil cp deploy/minikube/releases-beta-v2.json gs://minikube/releases-beta-v2.json else go run "${DIR}/release_update_releases_json.go" --releases-file deploy/minikube/releases.json --version "$TAGNAME" --legacy go run "${DIR}/release_update_releases_json.go" --releases-file deploy/minikube/releases-v2.json --version "$TAGNAME" @@ -62,13 +63,14 @@ else sed -i "s/Latest Release: .* (/Latest Release: ${TAGNAME} - ${now} (/" site/content/en/docs/_index.md git add -A - git commit -m "Update releases.json to include ${TAGNAME}" + git commit -m "Update releases.json & releases-v2.json to include ${TAGNAME}" git remote add minikube-bot git@github.com:minikube-bot/minikube.git git push -f minikube-bot jenkins-releases.json-${TAGNAME} # Send PR from minikube-bot/minikube to kubernetes/minikube - curl -X POST -u minikube-bot:${BOT_PASSWORD} -k -d "{\"title\": \"update releases.json to include ${TAGNAME}\",\"head\": \"minikube-bot:jenkins-releases.json-${TAGNAME}\",\"base\": \"master\"}" https://api.github.com/repos/kubernetes/minikube/pulls + curl -X POST -u minikube-bot:${BOT_PASSWORD} -k -d "{\"title\": \"update releases.json & releases-v2.json to include ${TAGNAME}\",\"head\": \"minikube-bot:jenkins-releases.json-${TAGNAME}\",\"base\": \"master\"}" https://api.github.com/repos/kubernetes/minikube/pulls # Upload file to GCS so that minikube can see the new version gsutil cp deploy/minikube/releases.json gs://minikube/releases.json + gsutil cp deploy/minikube/releases-v2.json gs://minikube/releases-v2.json fi diff --git a/pkg/minikube/notify/constants.go b/pkg/minikube/notify/constants.go index c1af50e860..a7bfbc7988 100644 --- a/pkg/minikube/notify/constants.go +++ b/pkg/minikube/notify/constants.go @@ -18,9 +18,9 @@ package notify const ( // GithubMinikubeReleasesURL is the URL of the minikube github releases JSON file - GithubMinikubeReleasesURL = "https://storage.googleapis.com/minikube/releases.json" + GithubMinikubeReleasesURL = "https://storage.googleapis.com/minikube/releases-v2.json" // GithubMinikubeBetaReleasesURL is the URL of the minikube Github beta releases JSON file - GithubMinikubeBetaReleasesURL = "https://storage.googleapis.com/minikube/releases-beta.json" + GithubMinikubeBetaReleasesURL = "https://storage.googleapis.com/minikube/releases-beta-v2.json" // GithubMinikubeReleasesAliyunURL is the URL of the minikube github releases JSON file from Aliyun Mirror GithubMinikubeReleasesAliyunURL = "https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/releases.json"