From 0cc705c82298e6b1b21249ee5a9c63be9c30ac2e Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 30 Apr 2026 16:03:21 -0500 Subject: [PATCH 1/2] chore(ironic): bump to latest understack/2026.1 Rebased to latest stable/2026.1 at 8b663209ff46ba2fbd05797ba7105b4f00e6dac4 and pulled in runbook v2 trait DB fix. --- containers/ironic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/ironic/Dockerfile b/containers/ironic/Dockerfile index 911767415..6c8e41e96 100644 --- a/containers/ironic/Dockerfile +++ b/containers/ironic/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && \ # clone source and patch it # renovate: name=openstack/ironic repo=https://github.com/rackerlabs/ironic.git branch=understack/2026.1 -ARG IRONIC_GIT_REF=74bddc1d9bc59d549c1fd62d7eee6d6cba984816 +ARG IRONIC_GIT_REF=b804ca2f641a6d0e8b2235b5a07725909c4667ed ADD --keep-git-dir=true https://github.com/rackerlabs/ironic.git#${IRONIC_GIT_REF} /src/ironic RUN git -C /src/ironic fetch --unshallow --tags From 0163e3d9877bb146022ba34f30b36150c7fc4c33 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 30 Apr 2026 16:05:33 -0500 Subject: [PATCH 2/2] fix(ironic): track stable branch of sushy for ironic fixes Sushy will have fixes that we'll need to consume in the Ironic container so track the stable series of Sushy. Utilize the upper-constraints.txt that was downloaded as part of the container build and remove sushy from the list so we can install our local clone. --- containers/ironic/Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/containers/ironic/Dockerfile b/containers/ironic/Dockerfile index 6c8e41e96..1b8ee87e1 100644 --- a/containers/ironic/Dockerfile +++ b/containers/ironic/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG OPENSTACK_VERSION="required_argument" -FROM quay.io/airshipit/venv_builder:2026.1-ubuntu_noble AS build +FROM quay.io/airshipit/venv_builder:${OPENSTACK_VERSION}-ubuntu_noble AS build COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ @@ -11,12 +11,17 @@ RUN apt-get update && \ patch \ && apt-get clean && rm -rf /var/lib/apt/lists/* -# clone source and patch it # renovate: name=openstack/ironic repo=https://github.com/rackerlabs/ironic.git branch=understack/2026.1 ARG IRONIC_GIT_REF=b804ca2f641a6d0e8b2235b5a07725909c4667ed ADD --keep-git-dir=true https://github.com/rackerlabs/ironic.git#${IRONIC_GIT_REF} /src/ironic RUN git -C /src/ironic fetch --unshallow --tags +# renovate: name=openstack/sushy repo=https://github.com/openstack/sushy.git branch=stable/2026.1 +ARG SUSHY_GIT_REF=eaf1dfb807cdc40f9b192bc892a4ab54c71198fe +ADD --keep-git-dir=true https://github.com/openstack/sushy.git#${SUSHY_GIT_REF} /src/sushy +RUN git -C /src/sushy fetch --unshallow --tags && \ + sed -i '/sushy==.*/d' /upper-constraints.txt + COPY python/ironic-understack /src/understack/ironic-understack COPY python/understack-flavor-matcher /src/understack/understack-flavor-matcher @@ -24,8 +29,9 @@ ARG OPENSTACK_VERSION="required_argument" RUN --mount=type=cache,target=/root/.cache/uv \ uv pip install \ --upgrade \ - --constraint https://releases.openstack.org/constraints/upper/${OPENSTACK_VERSION} \ + --constraint /upper-constraints.txt \ /src/ironic \ + /src/sushy \ /src/understack/ironic-understack \ /src/understack/understack-flavor-matcher \ proliantutils==2.16.3