From 75f6c9bb1b4a3662b59cd8e9d81697ae9e846d31 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Tue, 4 Sep 2018 16:23:54 -0500
Subject: [PATCH] Gate: Fix make command for osh-infra charts

This updates the make command for the osh-infra charts in the
deployment scripts to account for the charts residing in
openstack-helm-infra instead of the openstack-helm working
directory

Change-Id: I9f492e586f69b0caf908366a9cae2b55da0d4cfc
---
 tools/deployment/baremetal/020-ingress.sh               | 4 ++--
 tools/deployment/common/memcached.sh                    | 4 ++--
 tools/deployment/developer/ceph/040-ceph.sh             | 5 +++--
 tools/deployment/developer/ceph/045-ceph-ns-activate.sh | 4 ++--
 tools/deployment/developer/common/030-ingress.sh        | 3 ++-
 tools/deployment/developer/common/060-rabbitmq.sh       | 4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/deployment/baremetal/020-ingress.sh b/tools/deployment/baremetal/020-ingress.sh
index 59119efbaa..03459e1c96 100755
--- a/tools/deployment/baremetal/020-ingress.sh
+++ b/tools/deployment/baremetal/020-ingress.sh
@@ -17,10 +17,10 @@
 set -xe
 
 #NOTE: Lint and package chart
-make ingress
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} ingress
 
 #NOTE: Deploy global ingress
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 helm install ${OSH_INFRA_PATH}/ingress \
   --namespace=kube-system \
   --name=ingress-kube-system \
diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh
index 8a11f697f5..5891a6a298 100755
--- a/tools/deployment/common/memcached.sh
+++ b/tools/deployment/common/memcached.sh
@@ -17,10 +17,10 @@
 set -xe
 
 #NOTE: Lint and package chart
-make memcached
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} memcached
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install memcached ${OSH_INFRA_PATH}/memcached \
     --namespace=openstack \
diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh
index 5c387aadac..ea49300c48 100755
--- a/tools/deployment/developer/ceph/040-ceph.sh
+++ b/tools/deployment/developer/ceph/040-ceph.sh
@@ -17,12 +17,13 @@
 set -xe
 
 #NOTE: Lint and package chart
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
-  make "${CHART}"
+  make -C ${OSH_INFRA_PATH} "${CHART}"
 done
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+
 : ${OSH_EXTRA_HELM_ARGS:=""}
 [ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt
 CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
diff --git a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
index 31e83a9c8e..7f7f2a172a 100755
--- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
+++ b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
@@ -17,10 +17,10 @@
 set -xe
 
 #NOTE: Lint and package chart
-make ceph-provisioners
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} ceph-provisioners
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 tee /tmp/ceph-openstack-config.yaml <<EOF
 endpoints:
diff --git a/tools/deployment/developer/common/030-ingress.sh b/tools/deployment/developer/common/030-ingress.sh
index c144750dd9..f4fff33754 100755
--- a/tools/deployment/developer/common/030-ingress.sh
+++ b/tools/deployment/developer/common/030-ingress.sh
@@ -17,7 +17,8 @@
 set -xe
 
 #NOTE: Lint and package chart
-make ingress
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} ingress
 
 #NOTE: Deploy command
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
diff --git a/tools/deployment/developer/common/060-rabbitmq.sh b/tools/deployment/developer/common/060-rabbitmq.sh
index 000a6e89a1..605cb91926 100755
--- a/tools/deployment/developer/common/060-rabbitmq.sh
+++ b/tools/deployment/developer/common/060-rabbitmq.sh
@@ -17,10 +17,10 @@
 set -xe
 
 #NOTE: Lint and package chart
-make rabbitmq
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} rabbitmq
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install rabbitmq ${OSH_INFRA_PATH}/rabbitmq \
     --namespace=openstack \