From 2c11798c65f045e11551c25a1bbc4d7d8234271b Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Mon, 22 Apr 2019 08:07:20 -0500
Subject: [PATCH] Update airship-divingbell check job

This updates the airship-divingbell repository defined in the
single node check job to use the correct repository namespace.

This also updates the divingbell check job to use the standard
osh-infra-gate-runner playbook as well as the minikube based
kubernetes deployment

Change-Id: Iff53279b3e09058deb323d092955cbf87230b5e5
---
 .../osh-infra-airship-divingbell-check.yaml   | 25 -------------------
 tools/gate/divingbell/divingbell-tests.sh     | 25 +++++++++++++++++++
 zuul.d/jobs.yaml                              | 10 ++++++--
 3 files changed, 33 insertions(+), 27 deletions(-)
 delete mode 100644 playbooks/osh-infra-airship-divingbell-check.yaml
 create mode 100755 tools/gate/divingbell/divingbell-tests.sh

diff --git a/playbooks/osh-infra-airship-divingbell-check.yaml b/playbooks/osh-infra-airship-divingbell-check.yaml
deleted file mode 100644
index 1ba66df5c..000000000
--- a/playbooks/osh-infra-airship-divingbell-check.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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.
-
-- hosts: primary
-  tasks:
-    - name: clone and run divingbell override test
-      shell: |
-        git clone https://github.com/airship/divingbell
-        cd airship-divingbell
-        mkdir build
-        ln -s ../openstack-helm-infra build/openstack-helm-infra
-        export HELM_ARTIFACT_URL=https://storage.googleapis.com/kubernetes-helm/helm-v2.13.0-linux-amd64.tar.gz
-        ./tools/gate/scripts/010-build-charts.sh
-        sudo SKIP_BASE_TESTS=true ./tools/gate/scripts/020-test-divingbell.sh
diff --git a/tools/gate/divingbell/divingbell-tests.sh b/tools/gate/divingbell/divingbell-tests.sh
new file mode 100755
index 000000000..eae250715
--- /dev/null
+++ b/tools/gate/divingbell/divingbell-tests.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Copyright 2019 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
+
+git clone https://opendev.org/airship/divingbell
+cd divingbell
+mkdir build
+ln -s ../openstack-helm-infra build/openstack-helm-infra
+export HELM_ARTIFACT_URL=https://storage.googleapis.com/kubernetes-helm/helm-v2.13.0-linux-amd64.tar.gz
+./tools/gate/scripts/010-build-charts.sh
+sudo SKIP_BASE_TESTS=true ./tools/gate/scripts/020-test-divingbell.sh
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8addff656..bc233f887 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -373,9 +373,15 @@
 
 - job:
     name: openstack-helm-infra-airship-divingbell
-    parent: openstack-helm-infra
+    parent: openstack-helm-infra-functional
     nodeset: openstack-helm-single-node
-    run: playbooks/osh-infra-airship-divingbell-check.yaml
+    pre-run:
+      - playbooks/osh-infra-upgrade-host.yaml
+    run: playbooks/osh-infra-gate-runner.yaml
+    vars:
+      gate_scripts:
+        - ./tools/deployment/common/005-deploy-k8s.sh
+        - ./tools/gate/divingbell/divingbell-tests.sh
     required-projects:
       - airship/divingbell