Add missing Senlin image build
Skip-Release-Notes
Change-Id: I56cd20c5cf8f24fa0ac1b845c3665a481629e03e
diff --git a/docker-bake.hcl b/docker-bake.hcl
index fb1b0fe..bc04d96 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -203,6 +203,7 @@
"nova",
"octavia",
"placement",
+ "senlin",
"staffeln",
"tempest",
]
@@ -246,6 +247,7 @@
"openstack-nova",
"openstack-octavia",
"openstack-placement",
+ "openstack-senlin",
"openstack-staffeln",
"openstack-tempest",
"openvswitch",
diff --git a/images/senlin/Dockerfile b/images/senlin/Dockerfile
index fb0012a..1dea2cc 100644
--- a/images/senlin/Dockerfile
+++ b/images/senlin/Dockerfile
@@ -3,8 +3,7 @@
# Atmosphere-Rebuild-Time: 2024-06-26T17:38:39Z
FROM openstack-venv-builder AS build
-ARG SENLIN_GIT_REF=22fd77946723e25e595676e61893c1f645709b2f
-ADD --keep-git-dir=true https://opendev.org/openstack/senlin.git#${SENLIN_GIT_REF} /src/senlin
+ADD --keep-git-dir=true https://opendev.org/openstack/senlin.git#2023.1-eol /src/senlin
RUN git -C /src/senlin fetch --unshallow
RUN --mount=type=cache,mode=0755,target=/root/.cache/pip,sharing=private <<EOF bash -xe
pip3 install \
diff --git a/zuul.d/container-images/senlin.yaml b/zuul.d/container-images/senlin.yaml
deleted file mode 100644
index 55ad02c..0000000
--- a/zuul.d/container-images/senlin.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
- check:
- jobs:
- - atmosphere-build-container-image-senlin
- gate:
- jobs:
- - atmosphere-upload-container-image-senlin
- promote:
- jobs:
- - atmosphere-promote-container-image-senlin
-
-- job:
- name: atmosphere-build-container-image-senlin
- parent: atmosphere-build-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-build-container-image-ubuntu
- soft: true
- - name: atmosphere-build-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-build-container-image-python-base
- soft: true
- - name: atmosphere-build-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-build-container-image-openstack-python-runtime
- soft: true
- vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-senlin
- container_images:
- - context: images/senlin
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/senlin
- arch:
- - linux/amd64
- build_args:
- - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- - PROJECT=senlin
- tags:
- - "{{ zuul.branch | replace('stable/', '') }}"
- files: &container_image_files
- - images/ubuntu/.*
- - images/ubuntu-cloud-archive/.*
- - images/python-base/.*
- - images/openstack-venv-builder/.*
- - images/openstack-python-runtime/.*
- - images/senlin/.*
-
-- job:
- name: atmosphere-upload-container-image-senlin
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
- name: atmosphere-promote-container-image-senlin
- parent: atmosphere-promote-container-image
- vars: *container_image_vars
- files: *container_image_files