From f240d255cc92b7233b2be8bc9b833c503af73d87 Mon Sep 17 00:00:00 2001
From: Kevin Fox <kevin@efox.cc>
Date: Sun, 18 Dec 2016 15:23:05 -0800
Subject: [PATCH] Helm-entrypoint git hooks

This PS adds a place to easily add helm-entrypoint service packages
to test in the gate before we have enough to split out into its own
file. This will allow glance/cinder/nova/neutron to be tested more
easily.

Change-Id: I77fe47f891a6e1cc747b9102f8f7d4d04dc882bc
---
 tests/bin/ceph_workflow.sh               | 55 ++++++++++++++++--------
 tests/bin/setup_helm_entrypint_config.sh |  0
 tools/setup_gate.sh                      |  9 ++--
 3 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100644 tests/bin/setup_helm_entrypint_config.sh

diff --git a/tests/bin/ceph_workflow.sh b/tests/bin/ceph_workflow.sh
index 69bd1a382..991192441 100755
--- a/tests/bin/ceph_workflow.sh
+++ b/tests/bin/ceph_workflow.sh
@@ -3,6 +3,8 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
 IP=172.18.0.1
 
+. "$DIR/tests/bin/setup_helm_entrypint_config.sh"
+
 function ceph_values {
     echo "ceph:"
     echo "  monitors:"
@@ -47,21 +49,6 @@ done
 
 kollakube res create svc memcached
 
-helm install kolla/glance-api-svc --version 3.0.0-1 \
-    --namespace kolla --name glance-api-svc \
-    --set "element_port_external=true,kolla_kubernetes_external_vip=$IP"
-
-helm install kolla/glance-registry-svc --version 3.0.0-1 \
-    --namespace kolla --name glance-registry-svc
-
-helm install kolla/neutron-server-svc --version 3.0.0-1 \
-    --namespace kolla --name neutron-server-svc \
-    --set "element_port_external=true,kolla_kubernetes_external_vip=$IP"
-
-helm install kolla/cinder-api-svc --version 3.0.0-1 \
-    --namespace kolla --name cinder-api-svc \
-    --set "element_name=cinder,element_port_external=true,kolla_kubernetes_external_vip=$IP"
-
 helm install kolla/mariadb-svc --version 3.0.0-1 \
     --namespace kolla --name mariadb-svc --set element_name=mariadb
 
@@ -80,6 +67,25 @@ helm install kolla/keystone-internal-svc --version 3.0.0-1 \
     --namespace kolla --name keystone-internal-svc \
     --set "element_name=keystone-internal"
 
+#FIXME temporary until enough service packages are around. then
+#they will get their own test file.
+if [ "x$1" != "xhelm-entrypoint" ]; then
+
+helm install kolla/glance-api-svc --version 3.0.0-1 \
+    --namespace kolla --name glance-api-svc \
+    --set "element_port_external=true,kolla_kubernetes_external_vip=$IP"
+
+helm install kolla/glance-registry-svc --version 3.0.0-1 \
+    --namespace kolla --name glance-registry-svc
+
+helm install kolla/neutron-server-svc --version 3.0.0-1 \
+    --namespace kolla --name neutron-server-svc \
+    --set "element_port_external=true,kolla_kubernetes_external_vip=$IP"
+
+helm install kolla/cinder-api-svc --version 3.0.0-1 \
+    --namespace kolla --name cinder-api-svc \
+    --set "element_name=cinder,element_port_external=true,kolla_kubernetes_external_vip=$IP"
+
 helm install kolla/nova-api-svc --version 3.0.0-1 \
     --namespace kolla --name nova-api-svc \
     --set "element_name=nova,element_port_external=true,kolla_kubernetes_external_vip=$IP"
@@ -91,6 +97,13 @@ helm install kolla/nova-metadata-svc --version 3.0.0-1 \
 helm install kolla/nova-novncproxy-svc --version 3.0.0-1 \
     --namespace kolla --name nova-novncproxy-svc --set element_name=nova
 
+helm install kolla/horizon-svc --version 3.0.0-1 \
+    --namespace kolla --name horizon-svc --set element_name=horizon
+
+#FIXME temporary until enough service packages are around. then
+#they will get their own test file.
+fi
+
 helm install kolla/mariadb-init-element --version 3.0.0-1 \
     --namespace kolla --name mariadb-init-element \
     --set "$common_vars,element_name=mariadb"
@@ -99,9 +112,6 @@ helm install kolla/rabbitmq-init-element --version 3.0.0-1 \
     --namespace kolla --name rabbitmq-init-element \
     --set "element_name=rabbitmq,rabbitmq_cluster_cookie=67"
 
-helm install kolla/horizon-svc --version 3.0.0-1 \
-    --namespace kolla --name horizon-svc --set element_name=horizon
-
 $DIR/tools/pull_containers.sh kolla
 $DIR/tools/wait_for_pods.sh kolla
 
@@ -161,6 +171,15 @@ $DIR/tools/wait_for_pods.sh kolla
 $DIR/tools/build_local_admin_keystonerc.sh
 . ~/keystonerc_admin
 
+#FIXME temporary until enough service packages are around. then
+#they will get their own test file.
+if [ "x$1" == "xhelm-entrypoint" ]; then
+
+    echo Put test code here.
+
+    exit 0
+fi
+
 helm install kolla/neutron-create-keystone-service --version 3.0.0-1 \
     --namespace kolla --name neutron-create-keystone-service --set "$common_vars"
 
diff --git a/tests/bin/setup_helm_entrypint_config.sh b/tests/bin/setup_helm_entrypint_config.sh
new file mode 100644
index 000000000..e69de29bb
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index f395adba1..630aab6bb 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -153,8 +153,11 @@ tools/setup_simple_ceph_users.sh
 tools/setup_rbd_volumes.sh --yes-i-really-really-mean-it
 
 tests/bin/ceph_workflow.sh "$4" "$2"
-. ~/keystonerc_admin
 
-kubectl get pods --namespace=kolla
+if [ "x$4" != "xhelm-entrypoint" ]; then
+    . ~/keystonerc_admin
 
-tests/bin/basic_tests.sh
+    kubectl get pods --namespace=kolla
+
+    tests/bin/basic_tests.sh
+fi