Merge "OSH-Infra: Update multinode and aio-monitoring/logging jobs"

tools/deployment/common/openstack-exporter.sh

@@ -0,0 +1,41 @@
+#!/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 prometheus-openstack-exporter
+
+#NOTE: Deploy command
+tee /tmp/prometheus-openstack-exporter.yaml << EOF
+manifests:
+  job_ks_user: false
+dependencies:
+  static:
+    prometheus_openstack_exporter:
+      jobs: null
+      services: null
+EOF
+helm upgrade --install prometheus-openstack-exporter \
+    ./prometheus-openstack-exporter \
+    --namespace=openstack \
+    --values=/tmp/prometheus-openstack-exporter.yaml
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+helm status prometheus-openstack-exporter

tools/deployment/multinode/090-openstack-exporter.sh

@@ -1,41 +0,0 @@
-#!/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 prometheus-openstack-exporter
-
-#NOTE: Deploy command
-tee /tmp/prometheus-openstack-exporter.yaml << EOF
-manifests:
-  job_ks_user: false
-dependencies:
-  static:
-    prometheus_openstack_exporter:
-      jobs: null
-      services: null
-EOF
-helm upgrade --install prometheus-openstack-exporter \
-    ./prometheus-openstack-exporter \
-    --namespace=openstack \
-    --values=/tmp/prometheus-openstack-exporter.yaml
-
-#NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status prometheus-openstack-exporter

tools/deployment/multinode/090-openstack-exporter.sh

@@ -0,0 +1 @@
+../common/openstack-exporter.sh

tools/deployment/osh-infra-monitoring/100-openstack-exporter.sh

@@ -0,0 +1 @@
+../common/openstack-exporter.sh

zuul.d/jobs.yaml

@@ -157,8 +157,9 @@
         - ./tools/deployment/osh-infra-monitoring/070-kube-state-metrics.sh
         - ./tools/deployment/osh-infra-monitoring/080-node-exporter.sh
         - ./tools/deployment/osh-infra-monitoring/090-process-exporter.sh
-        - ./tools/deployment/osh-infra-monitoring/100-grafana.sh
+        - ./tools/deployment/osh-infra-monitoring/100-openstack-exporter.sh
-        - ./tools/deployment/osh-infra-monitoring/110-nagios.sh
+        - ./tools/deployment/osh-infra-monitoring/110-grafana.sh
+        - ./tools/deployment/osh-infra-monitoring/120-nagios.sh
         - ./tools/deployment/osh-infra-monitoring/grafana-selenium.sh
         - ./tools/deployment/osh-infra-monitoring/prometheus-selenium.sh
         - ./tools/deployment/osh-infra-monitoring/nagios-selenium.sh

zuul.d/project.yaml

@@ -19,11 +19,8 @@
     check:
       jobs:
         - openstack-helm-lint
-        - openstack-helm-infra-five-ubuntu
+        - openstack-helm-infra-aio-logging
-        - openstack-helm-infra-aio-logging:
+        - openstack-helm-infra-aio-monitoring
-            voting: false
-        - openstack-helm-infra-aio-monitoring:
-            voting: false
         - openstack-helm-infra-aio-network-policy:
             voting: false
         - openstack-helm-infra-openstack-support
@@ -35,12 +32,14 @@
     gate:
       jobs:
         - openstack-helm-lint
-        - openstack-helm-infra-five-ubuntu
+        - openstack-helm-infra-aio-logging
+        - openstack-helm-infra-aio-monitoring
         - openstack-helm-infra-openstack-support
         - openstack-helm-infra-kubernetes-keystone-auth
     periodic:
       jobs:
         - openstack-helm-infra-tenant-ceph
+        - openstack-helm-infra-five-ubuntu
     experimental:
       jobs:
         #NOTE(srwilkers): Make fedora job experimental until issues resolved