summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Eagan <sean.eagan@att.com>2019-03-11 16:17:41 -0500
committerSean Eagan <sean.eagan@att.com>2019-03-12 11:58:24 -0500
commitc3d4a464cb957545f04947be7e82b6771772760d (patch)
tree518a1ad7600a5236c5a2be583a57f27f6ea459a6
parentea6b129606d1321e193f63234455f3a9a2f1a960 (diff)
build: support helm-toolkit pinning
This pins the version of helm-toolkit used in the build due to a breaking change in helm-toolkit. Once helm 2.13.1 is released with this fix [0] we can update to use it, and update the helm-toolkit pin to "master". [0]: https://github.com/helm/helm/pull/5411 Change-Id: I827f1145c6d670cc955b82155455455a4f3ca486
Notes
Notes (review): Code-Review+1: Nishant Kumar <nishant.e.kumar@ericsson.com> Code-Review+1: Anthony Bellino <ab2434@att.com> Code-Review+1: Michael Beaver <michaelbeaver64@gmail.com> Code-Review+2: Drew Walters <drewwalters96@gmail.com> Workflow+1: Evgeniy L <eli@mirantis.com> Code-Review+2: Evgeniy L <eli@mirantis.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 12 Mar 2019 19:29:08 +0000 Reviewed-on: https://review.openstack.org/642825 Project: openstack/airship-promenade Branch: refs/heads/master
-rwxr-xr-xtools/helm_tk.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index f6ce975..ca4aed8 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -20,6 +20,9 @@ HELM=${1}
20HELM_PIDFILE=${2} 20HELM_PIDFILE=${2}
21SERVE_DIR=$(mktemp -d) 21SERVE_DIR=$(mktemp -d)
22 22
23# TODO: Set this back to "master" when uplifting armada to helm 2.13.1.
24HTK_STABLE_COMMIT=${HTK_COMMIT:-"d6996b8004db35acad7d51412b0b3216189e745f"}
25
23${HELM} init --client-only 26${HELM} init --client-only
24 27
25if [[ -s ${HELM_PIDFILE} ]]; then 28if [[ -s ${HELM_PIDFILE} ]]; then
@@ -65,8 +68,9 @@ fi
65 68
66{ 69{
67 cd "${SERVE_DIR}" 70 cd "${SERVE_DIR}"
68 git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true 71 git clone https://git.openstack.org/openstack/openstack-helm-infra.git || true
69 cd openstack-helm-infra 72 cd openstack-helm-infra
73 git reset --hard "${HTK_STABLE_COMMIT}"
70 74
71 make helm-toolkit 75 make helm-toolkit
72} 76}