Skip to content

Commit 7263791

Browse files
committed
[CI] Upgrade master from 2026.2 and add slurp job
Master is the next SLURP. Adjacent upgrade is from non-SLURP 2026.2. Skip-level slurp upgrade is from 2026.1. Also skip EPEL when building Debian IPA ramdisks Change-Id: I07289621a1dad8c2ab9d6ed942cc929acd08a25f Signed-off-by: Riccardo Pittau <elfosardo@gmail.com>
1 parent 6dd0e47 commit 7263791

3 files changed

Lines changed: 26 additions & 1 deletion

File tree

‎playbooks/roles/bifrost-create-dib-image/tasks/main.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,15 @@
148148
when:
149149
- dib_partitioning is defined
150150
- dib_partitioning | length > 0
151+
# IPA-builder still depends on the DIB epel element. That hook runs
152+
# install-packages yum-utils, which does not exist on Debian.
153+
- name: "Skip EPEL install for Debian IPA ramdisks"
154+
set_fact:
155+
dib_env_vars_final: "{{ dib_env_vars_final | combine({'DIB_EPEL_DISABLED': '2'}) }}"
156+
when:
157+
- dib_os_element == "debian"
158+
- "'ironic-python-agent-ramdisk' in (dib_elements | default(''))"
159+
- dib_env_vars_final.DIB_EPEL_DISABLED is not defined
151160
- name: "Set partitioning information if set"
152161
slurp:
153162
src: "{{ partitioning_file }}"

‎zuul.d/bifrost-jobs.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,16 @@
174174
required-projects:
175175
- openstack/ansible-collections-openstack
176176

177+
# Master is the next SLURP (2027.1). Adjacent upgrade is from the previous
178+
# non-SLURP release (2026.2). Skip-level slurp upgrade is from the previous
179+
# SLURP (2026.1).
177180
- job:
178181
name: bifrost-upgrade
179182
parent: bifrost-base
180183
run: playbooks/ci/upgrade.yaml
181184
timeout: 9600
182185
vars:
183-
upgrade_from: stable/2025.2
186+
upgrade_from: stable/2026.2
184187
skip_upgrade:
185188
- openstack/ansible-collections-openstack
186189
- openstack/diskimage-builder
@@ -211,6 +214,17 @@
211214
enable_keystone: true
212215
noauth_mode: false
213216

217+
- job:
218+
name: bifrost-slurp-upgrade
219+
parent: bifrost-upgrade
220+
vars:
221+
upgrade_from: stable/2026.1
222+
223+
- job:
224+
name: bifrost-slurp-upgrade-ubuntu-noble
225+
parent: bifrost-slurp-upgrade
226+
nodeset: bifrost-ubuntu-noble-8GB
227+
214228
# NOTE(TheJulia): This job is for use on the ironic repository,
215229
# to provide a minimal platform where we can execute a job where
216230
# basic performance numbers will be referenced/collected.

‎zuul.d/project.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
- bifrost-upgrade-keystone-centos-10
2929
- bifrost-upgrade-keystone-ubuntu-noble
3030
# Non-voting jobs
31+
- bifrost-slurp-upgrade-ubuntu-noble:
32+
voting: false
3133
- bifrost-integration-redfish-pxe-uefi-ubuntu-noble:
3234
voting: false
3335
- bifrost-collections-src:

0 commit comments

Comments
 (0)