From 95adcb72010bc89c17d9b1261f1492446a317650 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Fri, 10 May 2024 14:41:40 -0500
Subject: [PATCH] Fix cinder deployment script

Recently we introduced test jobs that consume
charts from either local or public Helm repos.
All the deployment scripts must use variables
OSH_HELM_REPO or OSH_INFRA_HELM_REPO
which by default point to local directories
but these new jobs set them to use HTTP repos.

Change-Id: I2e17790385c2bdc0b79607c240a47639c61365c0
---
 tools/deployment/component/cinder/cinder.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/deployment/component/cinder/cinder.sh b/tools/deployment/component/cinder/cinder.sh
index f86e700370..7330488e2b 100755
--- a/tools/deployment/component/cinder/cinder.sh
+++ b/tools/deployment/component/cinder/cinder.sh
@@ -13,8 +13,10 @@
 #    under the License.
 set -xe
 
-#NOTE: Get the over-rides to use
-: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -c cinder ${FEATURES})"}
+#NOTE: Define variables
+: ${OSH_HELM_REPO:="../openstack-helm"}
+: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c cinder ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command
@@ -55,7 +57,7 @@ conf:
       rbd_user: cinder
       rbd_secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337
 EOF
-helm upgrade --install cinder ./cinder \
+helm upgrade --install cinder ${OSH_HELM_REPO}/cinder \
   --namespace=openstack \
   --values=/tmp/cinder.yaml \
   --timeout=600s \