From 52b05321a67a4df29a8554dd22cc8d5c96f5492d Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Fri, 6 Mar 2020 10:06:39 -0600
Subject: [PATCH] Add cinder deployment to OS-support check

This patchset adds a cinder deployment to the openstack-support
check in order to deploy a service that further exercises ceph
in Zuul.

Change-Id: I722049016d15c5297fdc9666c4472a1c884a7b68
---
 .../openstack-support/130-cinder.sh           | 59 +++++++++++++++++++
 zuul.d/jobs.yaml                              |  1 +
 2 files changed, 60 insertions(+)
 create mode 100755 tools/deployment/openstack-support/130-cinder.sh

diff --git a/tools/deployment/openstack-support/130-cinder.sh b/tools/deployment/openstack-support/130-cinder.sh
new file mode 100755
index 000000000..41777e46d
--- /dev/null
+++ b/tools/deployment/openstack-support/130-cinder.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+set -xe
+
+: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
+: ${OSH_EXTRA_HELM_ARGS:=""}
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(./tools/deployment/common/get-values-overrides.sh cinder)"}
+
+#NOTE: Lint and package chart
+cd ${OSH_PATH}
+make cinder
+cd -
+
+#NOTE: Deploy command
+: ${OSH_EXTRA_HELM_ARGS:=""}
+tee /tmp/cinder.yaml <<EOF
+conf:
+  ceph:
+    pools:
+      backup:
+        replication: 1
+        crush_rule: same_host
+        chunk_size: 8
+        app_name: cinder-backup
+      cinder.volumes:
+        replication: 1
+        crush_rule: same_host
+        chunk_size: 8
+        app_name: cinder-volume
+EOF
+
+helm upgrade --install cinder ${OSH_PATH}/cinder \
+  --namespace=openstack \
+  --values=/tmp/cinder.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CINDER}
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+export OS_CLOUD=openstack_helm
+openstack service list
+sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
+openstack volume type list
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index f58e1275e..61c189fab 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -389,6 +389,7 @@
         - ./tools/deployment/openstack-support/100-ceph-radosgateway.sh
         - ./tools/deployment/openstack-support/110-openstack-exporter.sh
         - ./tools/deployment/openstack-support/120-powerdns.sh
+        - ./tools/deployment/openstack-support/130-cinder.sh
 
 - job:
     name: openstack-helm-infra-five-ubuntu