From a1c0645c36031cb9cf0a5f3f23b8ae1716a7a7cc Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Tue, 11 Apr 2023 07:04:46 +0300
Subject: [PATCH] Enable yoga compute-kit job
Change-Id: I6860194ca90d2f81f32cb9bb8633a5af1d798b31
---
tools/deployment/developer/common/170-setup-gateway.sh | 6 ++++--
zuul.d/jobs-openstack-helm.yaml | 1 +
zuul.d/project.yaml | 5 ++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/deployment/developer/common/170-setup-gateway.sh b/tools/deployment/developer/common/170-setup-gateway.sh
index b626843556..6e4ef23b44 100755
--- a/tools/deployment/developer/common/170-setup-gateway.sh
+++ b/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
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index a931df645f..bcb19f31bc 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/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
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ac0b1facff..3f45ef1f55 100644
--- a/zuul.d/project.yaml
+++ b/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