From 251bfab6b193cdfbe4b6b9fedcb99c09204605bc Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Thu, 7 Mar 2019 13:50:34 -0600
Subject: [PATCH] Add postgresql to osh-infra-monitoring job

This adds a deployment step for postgresql to the single node
monitoring job to validate the exporter works as intended

Change-Id: I2680b3e40ca4466e27daf6145cef064c312a7b57
---
 .../osh-infra-monitoring/130-postgresql.sh    | 35 +++++++++++++++++++
 zuul.d/jobs.yaml                              |  1 +
 2 files changed, 36 insertions(+)
 create mode 100755 tools/deployment/osh-infra-monitoring/130-postgresql.sh

diff --git a/tools/deployment/osh-infra-monitoring/130-postgresql.sh b/tools/deployment/osh-infra-monitoring/130-postgresql.sh
new file mode 100755
index 000000000..d99351593
--- /dev/null
+++ b/tools/deployment/osh-infra-monitoring/130-postgresql.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    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
+
+#NOTE: Lint and package chart
+make postgresql
+
+#NOTE: Deploy command
+: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
+helm upgrade --install postgresql ./postgresql \
+    --namespace=osh-infra \
+    --set monitoring.prometheus.enabled=true \
+    --set storage.pvc.size=1Gi \
+    ${OSH_INFRA_EXTRA_HELM_ARGS} \
+    ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB}
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh osh-infra
+
+#NOTE: Validate Deployment info
+helm status postgresql
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d53c28994..7429f43e3 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -157,6 +157,7 @@
         - ./tools/deployment/osh-infra-monitoring/090-process-exporter.sh
         - ./tools/deployment/osh-infra-monitoring/110-grafana.sh
         - ./tools/deployment/osh-infra-monitoring/120-nagios.sh
+        - ./tools/deployment/osh-infra-monitoring/130-postgresql.sh
         - ./tools/deployment/osh-infra-monitoring/600-grafana-selenium.sh
         - ./tools/deployment/osh-infra-monitoring/610-prometheus-selenium.sh
         - ./tools/deployment/osh-infra-monitoring/620-nagios-selenium.sh