summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Eagan <sean.eagan@att.com>2019-03-11 15:57:09 -0500
committerSean Eagan <sean.eagan@att.com>2019-03-12 07:57:03 -0500
commitd1fca990cf43ef2036bc1e78a1055f9241a3d944 (patch)
treeba6a035a1da6f9ce0072fb9c0162a06482661216
parentc132915dcc3289342bd272aca774947db1158c41 (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: I7b9085aacc1201baa0bf2ca73f9f2127a646a7b2
Notes
Notes (review): Code-Review+2: Drew Walters <drewwalters96@gmail.com> Code-Review+1: Michael Beaver <michaelbeaver64@gmail.com> Code-Review+1: Vladyslav Drok <vdrok@mirantis.com> Code-Review+1: Nishant Kumar <nishant.e.kumar@ericsson.com> Code-Review+2: Evgeniy L <eli@mirantis.com> Workflow+1: Evgeniy L <eli@mirantis.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 12 Mar 2019 19:27:05 +0000 Reviewed-on: https://review.openstack.org/642568 Project: openstack/airship-armada 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 90b5d34..5ccd3ba 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -22,6 +22,9 @@ HELM=${1}
22HELM_PIDFILE=${2} 22HELM_PIDFILE=${2}
23SERVE_DIR=$(mktemp -d) 23SERVE_DIR=$(mktemp -d)
24 24
25# TODO: Set this back to "master" when uplifting armada to helm 2.13.1.
26HTK_STABLE_COMMIT=${HTK_COMMIT:-"d6996b8004db35acad7d51412b0b3216189e745f"}
27
25${HELM} init --client-only 28${HELM} init --client-only
26 29
27if [[ -s ${HELM_PIDFILE} ]]; then 30if [[ -s ${HELM_PIDFILE} ]]; then
@@ -67,8 +70,9 @@ fi
67 70
68{ 71{
69 cd "${SERVE_DIR}" 72 cd "${SERVE_DIR}"
70 git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true 73 git clone https://git.openstack.org/openstack/openstack-helm-infra.git || true
71 cd openstack-helm-infra 74 cd openstack-helm-infra
75 git reset --hard "${HTK_STABLE_COMMIT}"
72 76
73 make helm-toolkit 77 make helm-toolkit
74} 78}