From 0da3bfb941eb9d332667cdd93ad40e38eb811578 Mon Sep 17 00:00:00 2001
From: Graham Steffaniak <v-grahams@microsoft.com>
Date: Tue, 5 Apr 2022 13:08:33 -0500
Subject: [PATCH] Added zuul umbrella chart check

 zuul job to verify the openstack umbrella chart deployment works
 properly.

Change-Id: Iafd7de13dfdf8f5942d54a4f37324e4a3dda8ef3
---
 zuul.d/jobs-openstack-helm.yaml | 31 +++++++++++++++++++++++++++++++
 zuul.d/project.yaml             |  1 +
 2 files changed, 32 insertions(+)

diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index d278b2ba92..41b2221d39 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -166,6 +166,28 @@
         - - ./tools/deployment/developer/common/900-use-it.sh
           - ./tools/deployment/common/force-cronjob-run.sh
 
+- job:
+    name: openstack-helm-compute-kit-umbrella
+    parent: openstack-helm-chart-deploy
+    vars:
+      run_helm_tests: "no"
+      gate_scripts_relative_path: ../openstack-helm
+      gate_scripts:
+        - ./tools/deployment/common/install-packages.sh
+        - ./tools/gate/deploy-k8s.sh
+        - - ./tools/deployment/common/setup-client.sh
+          - ./tools/deployment/component/common/ingress.sh
+        - ./tools/deployment/component/common/openstack.sh
+        - ./tools/deployment/component/compute-kit/openvswitch.sh
+        - ./tools/deployment/component/compute-kit/libvirt.sh
+        - ./tools/deployment/component/compute-kit/compute-kit.sh
+        - - export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron
+          - ./tools/deployment/common/run-helm-tests.sh nova;
+          - ./tools/deployment/common/run-helm-tests.sh openstack;
+        - ./tools/deployment/developer/common/170-setup-gateway.sh
+        - - ./tools/deployment/developer/common/900-use-it.sh
+          - ./tools/deployment/common/force-cronjob-run.sh
+
 - job:
     name: openstack-helm-compute-kit-train-ubuntu_bionic
     parent: openstack-helm-compute-kit
@@ -193,6 +215,15 @@
         container_distro_name: ubuntu
         container_distro_version: focal
 
+- job:
+    name: openstack-helm-compute-kit-victoria-ubuntu_focal-umbrella
+    parent: openstack-helm-compute-kit-umbrella
+    vars:
+      osh_params:
+        openstack_release: victoria
+        container_distro_name: ubuntu
+        container_distro_version: focal
+
 - job:
     name: openstack-helm-compute-kit-wallaby-ubuntu_focal
     parent: openstack-helm-compute-kit
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index cce315f2d5..cb3e09cf35 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -31,6 +31,7 @@
         - openstack-helm-compute-kit-train-ubuntu_bionic
         - openstack-helm-compute-kit-ussuri-ubuntu_bionic
         - openstack-helm-compute-kit-victoria-ubuntu_focal
+        - openstack-helm-compute-kit-victoria-ubuntu_focal-umbrella
         - openstack-helm-compute-kit-wallaby-ubuntu_focal
         # - openstack-helm-compute-kit-xena-ubuntu_focal
         - openstack-helm-horizon-train-ubuntu_bionic