From fc547a3f6e88c5dc49657fd2860de4e8efd40e31 Mon Sep 17 00:00:00 2001 From: Matt Anson Date: Wed, 14 Dec 2022 07:47:58 +0000 Subject: [PATCH 1/2] Add Ubuntu image tags --- etc/kayobe/kolla.yml | 2 +- etc/kayobe/kolla/globals.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 61b7253e7b..59fc4d50ef 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -96,7 +96,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}" # Kolla OpenStack release version. This should be a Docker image tag. # Default is {{ openstack_release }}. -kolla_openstack_release: xena-20221010T103511 +kolla_openstack_release: "{% if kolla_base_distro == 'centos' %}xena-20221010T103511{% else %}xena-20221213T204703{% endif %}" # Docker tag applied to built container images. Default is # {{ kolla_openstack_release }}. diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 774da38baa..c8fc2413af 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -5,6 +5,8 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" {% if kolla_base_distro == 'centos' %} bifrost_tag: xena-20221128T101757 +{% else %} +bifrost_tag: xena-20221213T224057 {% endif %} ############################################################################# From 9773d874c5dca4da275407c7ba966ffce3985511 Mon Sep 17 00:00:00 2001 From: Matt Anson Date: Wed, 14 Dec 2022 07:48:22 +0000 Subject: [PATCH 2/2] Enable Ubuntu AIO CI --- .github/workflows/stackhpc-pull-request.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml index 4b027f44f3..a534d413d6 100644 --- a/.github/workflows/stackhpc-pull-request.yml +++ b/.github/workflows/stackhpc-pull-request.yml @@ -107,8 +107,7 @@ jobs: vm_image: Ubuntu-20.04 OS_CLOUD: sms-lab-release secrets: inherit - # NOTE: Ubuntu images not available yet. - if: false && github.repository == 'stackhpc/stackhpc-kayobe-config' + if: github.repository == 'stackhpc/stackhpc-kayobe-config' all-in-one-ubuntu-ovn: name: aio (Ubuntu OVN) @@ -122,5 +121,4 @@ jobs: vm_image: Ubuntu-20.04 OS_CLOUD: sms-lab-release secrets: inherit - # NOTE: Ubuntu images not available yet. - if: false && github.repository == 'stackhpc/stackhpc-kayobe-config' + if: github.repository == 'stackhpc/stackhpc-kayobe-config'