Add cni helm to release archive (istio#14752)

* Fixing Quotes * Add cni helm to release archive
AmitKumarDas · Jun 12, 2019 · 4b80960 · 4b80960
1 parent bafb4fb
commit 4b80960
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/prow/lib.sh b/prow/lib.sh
@@ -47,6 +47,8 @@ function setup_and_export_git_sha() {
     GIT_SHA="$(git rev-parse --verify HEAD)"
     export GIT_SHA
   fi
+  GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+  export GIT_BRANCH
   gcloud auth configure-docker -q
 }
 

diff --git a/prow/release-test.sh b/prow/release-test.sh
@@ -42,7 +42,7 @@ function create_gcb_env() {
   touch /workspace/manifest.txt
 
 cat << EOF > "/workspace/gcb_env.sh"
-export CB_BRANCH="${GIT_SHA}"
+export CB_BRANCH="${GIT_BRANCH}"
 export CB_VERSION="${GIT_SHA}"
 export CB_ISTIOCTL_DOCKER_HUB="docker.io/istio"
 export CB_PIPELINE_TYPE=daily

diff --git a/release/create_release_archives.sh b/release/create_release_archives.sh
@@ -170,6 +170,11 @@ rm -rf "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/test-values/"
 
 ls -l  "${COMMON_FILES_DIR}/install/kubernetes/helm/istio"
 
+TEMP_DIR=$(mktemp -d)
+pushd "${TEMP_DIR}"
+  git clone -b "${CB_BRANCH}" https://github.com/istio/cni.git
+  cp -r cni/deployments/kubernetes/install/helm/istio-cni "${COMMON_FILES_DIR}/install/kubernetes/helm"
+popd
 # Changing dir such that tar and zip files are
 # created with right hiereachy
 pushd "${COMMON_FILES_DIR}/.."

diff --git a/release/gcb/helm_charts.sh b/release/gcb/helm_charts.sh
@@ -28,7 +28,7 @@ mkdir -vp "$WORK_DIR/istio"
 cp -R "./istio-${CB_VERSION}/install" "$WORK_DIR/istio/install"
 
 pushd "$WORK_DIR"
-    git clone -b master https://github.com/istio/cni.git
+    git clone -b "${CB_BRANCH}" https://github.com/istio/cni.git
 popd