diff --git a/.github/workflows/containers-openstack.yaml b/.github/workflows/containers-openstack.yaml index 941f38094..fded2c244 100644 --- a/.github/workflows/containers-openstack.yaml +++ b/.github/workflows/containers-openstack.yaml @@ -51,3 +51,20 @@ jobs: dockerfile_path: containers/${{ matrix.project }}/Dockerfile build_args: OPENSTACK_VERSION=2026.1 latest_name: "2026.1" + + openstack-2026-2: + strategy: + matrix: + include: + - project: horizon + openstack_version: "2026.2" + ubuntu_release: resolute + uses: ./.github/workflows/build-container-reuse.yaml + secrets: inherit + with: + container_name: ${{ matrix.project }} + dockerfile_path: containers/${{ matrix.project }}/Dockerfile + build_args: | + OPENSTACK_VERSION=${{ matrix.openstack_version }} + UBUNTU_RELEASE=${{ matrix.ubuntu_release }} + latest_name: ${{ matrix.openstack_version }} diff --git a/components/images-openstack.yaml b/components/images-openstack.yaml index 04c023280..df0ee680a 100644 --- a/components/images-openstack.yaml +++ b/components/images-openstack.yaml @@ -83,8 +83,8 @@ images: ovn_controller: "quay.io/airshipit/ovn:ubuntu_noble-20260711" # horizon - horizon: "ghcr.io/rackerlabs/understack/horizon:2026.1" - horizon_db_sync: "ghcr.io/rackerlabs/understack/horizon:2026.1" + horizon: "ghcr.io/rackerlabs/understack/horizon:pr-2465@sha256:97f94d632570664f0185b103f30a307df81e66ba143027a3393d99605dba2317" + horizon_db_sync: "ghcr.io/rackerlabs/understack/horizon:pr-2465@sha256:97f94d632570664f0185b103f30a307df81e66ba143027a3393d99605dba2317" # glance glance_api: "ghcr.io/rackerlabs/understack/glance:2026.1" diff --git a/containers/horizon/Dockerfile b/containers/horizon/Dockerfile index f8b18402c..4f0b452d8 100644 --- a/containers/horizon/Dockerfile +++ b/containers/horizon/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 ARG OPENSTACK_VERSION="required_argument" -FROM quay.io/airshipit/horizon:${OPENSTACK_VERSION}-ubuntu_noble AS final +ARG UBUNTU_RELEASE="noble" +FROM quay.io/airshipit/horizon:${OPENSTACK_VERSION}-ubuntu_${UBUNTU_RELEASE} AS final