Merge "Enable yoga compute-kit job"

tools/deployment/developer/common/170-setup-gateway.sh

@@ -18,8 +18,10 @@ set -xe
 : ${OSH_BR_EX_ADDR:="172.24.4.1/24"}
 sudo ip addr replace ${OSH_BR_EX_ADDR} dev br-ex
 sudo ip link set br-ex up
-
-: ${DNSMASQ_IMAGE:=docker.io/openstackhelm/neutron:xena-ubuntu_focal}
+: ${OPENSTACK_RELEASE:=xena}
+: ${CONTAINER_DISTRO_NAME:=ubuntu}
+: ${CONTAINER_DISTRO_VERSION:=focal}
+: ${DNSMASQ_IMAGE:=docker.io/openstackhelm/neutron:${OPENSTACK_RELEASE}-${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION}}
 
 # NOTE(portdirect): With Docker >= 1.13.1 the default FORWARD chain policy is
 # configured to DROP, for the l3 agent to function as expected and for

zuul.d/jobs-openstack-helm.yaml

@@ -234,6 +234,7 @@
 - job:
     name: openstack-helm-compute-kit-yoga-ubuntu_focal
     parent: openstack-helm-compute-kit
+    nodeset: openstack-helm-single-32GB-node
     vars:
       osh_params:
         openstack_release: yoga

zuul.d/project.yaml

@@ -26,13 +26,12 @@
         - openstack-helm-cinder-victoria-ubuntu_focal
         - openstack-helm-cinder-wallaby-ubuntu_focal
         - openstack-helm-cinder-xena-ubuntu_focal
-        # - openstack-helm-cinder-yoga-ubuntu_focal
+        - openstack-helm-cinder-yoga-ubuntu_focal
         - 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
-        # TODO(gagehugo): Fix and enable
-        # - openstack-helm-compute-kit-yoga-ubuntu_focal
+        - openstack-helm-compute-kit-yoga-ubuntu_focal
         - openstack-helm-horizon-victoria-ubuntu_focal
         - openstack-helm-horizon-wallaby-ubuntu_focal
         - openstack-helm-keystone-ldap