Cherrypick changes from master to release 1.1 for repease process (is…

…tio#13597)
AmitKumarDas · May 1, 2019 · bb2e147 · bb2e147
1 parent 9b6d31b
commit bb2e147
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/release/gcb/run_build.sh b/release/gcb/run_build.sh
@@ -35,5 +35,5 @@ cd /workspace/go/src/istio.io/istio || exit 2
 cd /workspace || exit 3
 /workspace/store_artifacts.sh
 /workspace/rel_push_docker_build_version.sh
-/workspace/helm_charts.sh
 /workspace/helm_values.sh
+/workspace/helm_charts.sh
diff --git a/release/gcb/run_daily_release.sh b/release/gcb/run_daily_release.sh
@@ -16,6 +16,8 @@
 
 set -x
 
+gsutil -q rm -rf "gs://$CB_GCS_FULL_STAGING_PATH" || echo "Staging path does not exist."
+
 #copy files over to final destination
 gsutil -m cp -r "gs://$CB_GCS_BUILD_PATH" "gs://$CB_GCS_FULL_STAGING_PATH"
 

diff --git a/release/gcb/run_monthly_release.sh b/release/gcb/run_monthly_release.sh
@@ -16,6 +16,8 @@
 
 set -x
 
+gsutil -q rm -rf "gs://$CB_GCS_FULL_STAGING_PATH" || echo "Staging path does not exist."
+
 #copy files over to final destination
 gsutil -m cp -r "gs://$CB_GCS_BUILD_PATH" "gs://$CB_GCS_FULL_STAGING_PATH"
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,8 @@ @@
     set -x
+    gsutil -q rm -rf "gs://$CB_GCS_FULL_STAGING_PATH" || echo "Staging path does not exist."
     #copy files over to final destination
     gsutil -m cp -r "gs://$CB_GCS_BUILD_PATH" "gs://$CB_GCS_FULL_STAGING_PATH"
@@ Expand Down @@