From 0a3ff67bfcc369fada9ed6d7790750da0a93d8c9 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Tue, 30 Nov 2021 21:20:12 -0600
Subject: [PATCH] Update horizon job to wallaby and ubuntu focal

This change updates the horizon job to run under the wallaby
release on ubuntu focal image. Due to the dependencies
between the images repo and this one, we will need to create
a separate new job before moving over.

Change-Id: I966adc8ac4a54d3c2c06707ecd6c041fe4708c96
---
 zuul.d/jobs-openstack-helm.yaml | 24 ++++++++++++++++++++++++
 zuul.d/project.yaml             |  3 +--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 41b2221d..a732ecdf 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -266,6 +266,30 @@
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/horizon/horizon.sh
 
+- job:
+    name: openstack-helm-horizon-wallaby-ubuntu_focal
+    parent: openstack-helm-chart-deploy
+    files:
+      - ^horizon/.*$
+      - ^zuul\.d/.*$
+      - ^tools/deployment/component/horizon/.*$
+    vars:
+      osh_params:
+        openstack_release: wallaby
+        container_distro_name: ubuntu
+        container_distro_version: focal
+      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/mariadb.sh
+        - ./tools/deployment/component/common/memcached.sh
+        - ./tools/deployment/component/common/rabbitmq.sh
+        - ./tools/deployment/component/keystone/keystone.sh
+        - ./tools/deployment/component/horizon/horizon.sh
+
 - job:
     timeout: 10800
     name: openstack-helm-multinode-compute-kit-ussuri-ubuntu_bionic
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index cb3e09cf..15bc221d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -34,7 +34,7 @@
         - 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
+        - openstack-helm-horizon-wallaby-ubuntu_focal
         - openstack-helm-keystone-ldap
     gate:
       jobs:
@@ -42,7 +42,6 @@
         - openstack-helm-tls
         - openstack-helm-cinder-train-ubuntu_bionic
         - openstack-helm-compute-kit-train-ubuntu_bionic
-        - openstack-helm-horizon-train-ubuntu_bionic
         - openstack-helm-multinode-compute-kit-train-ubuntu_bionic
         - openstack-helm-multinode-cinder-train-ubuntu_bionic
     post: