Merge "Update horizon job to wallaby and ubuntu focal"

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

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: