Skip to content

Commit fbdaff8

Browse files
authored
Merge pull request #84 from stackhpc/upstream/master-2025-09-08
Synchronise master with upstream
2 parents 76c4e52 + f84da19 commit fbdaff8

File tree

5 files changed

+24
-63
lines changed

5 files changed

+24
-63
lines changed

doc/source/install/index.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ Supported operating systems
1515
Full support (fully tested in the CI, no known or potential issues):
1616

1717
* Ubuntu 22.04 "Jammy" and 24.04 "Noble"
18-
* Debian 11 "Bullseye" and 12 "Bookworm"
19-
20-
Deprecated support:
21-
22-
* CentOS Stream 9
18+
* Debian 12 "Bookworm"
2319

2420
.. note::
2521
Operating systems evolve and so does the support for them, even on stable

playbooks/roles/bifrost-deploy-nodes-dynamic/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
set_fact:
7676
instance_info:
7777
image_source: "{{ deploy_image_source }}"
78-
image_checksum: "{{ deploy_image_checksum | default(omit) }}"
79-
image_rootfs_uuid: "{{ deploy_image_rootfs | default(omit) }}"
80-
image_type: "{{ deploy_image_type | default(omit) }}"
78+
image_checksum: "{{ deploy_image_checksum | default(omit, true) }}"
79+
image_rootfs_uuid: "{{ deploy_image_rootfs | default(omit, true) }}"
80+
image_type: "{{ deploy_image_type | default(omit, true) }}"
8181
root_gb: "{{ deploy_root_gb if deploy_image_type | default('') == 'partition' else omit }}"
8282

8383
- name: "Deploy to hardware"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
deprecations:
3+
- |
4+
Support for Debian 11 Bullseye has been removed.
5+
- |
6+
Support for CentOS Stream 9 has been removed.
7+
upgrade:
8+
- |
9+
Because of upstream changes, Ironic can no longer be run on Python 3.9.
10+
Before upgrading to this version, ensure you're using Bifrost on
11+
an operating system that ships a newer Python version.

zuul.d/bifrost-jobs.yaml

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
parent: bifrost-integration-dhcp
4545
nodeset: ubuntu-jammy
4646

47-
- job:
48-
name: bifrost-integration-dhcp-centos-9
49-
parent: bifrost-integration-dhcp
50-
nodeset: centos-9-stream
51-
5247
- job:
5348
name: bifrost-integration-dibipa-debian
5449
parent: bifrost-integration
@@ -64,11 +59,6 @@
6459
parent: bifrost-integration-dibipa-debian
6560
nodeset: ubuntu-jammy
6661

67-
- job:
68-
name: bifrost-integration-dibipa-debian-centos-9
69-
parent: bifrost-integration-dibipa-debian
70-
nodeset: centos-9-stream
71-
7262
- job:
7363
name: bifrost-integration-tinyipa
7464
parent: bifrost-base
@@ -132,6 +122,7 @@
132122
vars:
133123
cli_test: true
134124

125+
# FIXME(dtantsur): remove when this job is no longer used on Ironic
135126
- job:
136127
name: bifrost-integration-redfish-vmedia-uefi-centos-9
137128
parent: bifrost-integration-tinyipa-centos-9
@@ -140,35 +131,12 @@
140131
use_vmedia: true
141132

142133
- job:
143-
name: bifrost-integration-redfish-pxe-uefi-centos-9
144-
parent: bifrost-integration-tinyipa-centos-9
134+
name: bifrost-integration-redfish-pxe-uefi-ubuntu-noble
135+
parent: bifrost-integration-tinyipa-ubuntu-noble
145136
vars:
146137
enable_grub_network_boot: true
147138
test_driver: redfish
148139

149-
- job:
150-
name: bifrost-integration-tinyipa-centos-9
151-
parent: bifrost-integration-tinyipa
152-
nodeset: centos-9-stream
153-
154-
- job:
155-
name: bifrost-integration-tinyipa-keystone-centos-9
156-
parent: bifrost-integration-tinyipa-centos-9
157-
required-projects:
158-
- openstack/keystone
159-
- openstack/ironic-prometheus-exporter
160-
vars:
161-
enable_keystone: true
162-
enable_tls: true
163-
test_driver: redfish
164-
enable_prometheus_exporter: true
165-
166-
- job:
167-
name: bifrost-integration-inspector-centos-9
168-
parent: bifrost-integration-tinyipa-centos-9
169-
vars:
170-
use_inspector: true
171-
172140
- job:
173141
name: bifrost-integration-tinyipa-debian-bullseye
174142
parent: bifrost-integration-tinyipa
@@ -199,7 +167,7 @@
199167
run: playbooks/ci/upgrade.yaml
200168
timeout: 9600
201169
vars:
202-
upgrade_from: stable/2024.2
170+
upgrade_from: stable/2025.1
203171
skip_upgrade:
204172
- openstack/diskimage-builder
205173

@@ -209,9 +177,9 @@
209177
nodeset: ubuntu-jammy
210178

211179
- job:
212-
name: bifrost-upgrade-keystone-centos9
180+
name: bifrost-upgrade-keystone-ubuntu-noble
213181
parent: bifrost-upgrade
214-
nodeset: centos-9-stream
182+
nodeset: ubuntu-noble
215183
required-projects:
216184
- openstack/keystone
217185
vars:

zuul.d/project.yaml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,21 @@
1212
- bifrost-integration-tinyipa-keystone-ubuntu-noble
1313
- bifrost-integration-tinyipa-keystone-ubuntu-jammy
1414
- bifrost-integration-tinyipa-debian-bookworm
15-
- bifrost-integration-tinyipa-debian-bullseye
1615
- bifrost-integration-redfish-vmedia-uefi-ubuntu-noble
1716
- bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
1817
- bifrost-integration-redfish-vmedia-uefi-debian-bookworm
1918
- bifrost-integration-inspector-ubuntu-jammy
2019
- bifrost-upgrade-ubuntu-jammy
20+
- bifrost-upgrade-keystone-ubuntu-noble
2121
# Non-voting jobs
22-
- bifrost-integration-tinyipa-centos-9:
23-
voting: false
24-
- bifrost-integration-inspector-centos-9:
25-
voting: false
26-
- bifrost-integration-redfish-vmedia-uefi-centos-9:
27-
voting: false
28-
- bifrost-integration-tinyipa-keystone-centos-9:
29-
voting: false
30-
- bifrost-upgrade-keystone-centos9:
31-
voting: false
3222
- bifrost-slurp-upgrade-ubuntu-jammy:
3323
voting: false
34-
- bifrost-integration-redfish-pxe-uefi-centos-9:
24+
- bifrost-integration-redfish-pxe-uefi-ubuntu-noble:
3525
voting: false
3626
- bifrost-integration-dhcp-ubuntu-jammy:
3727
voting: false
38-
- bifrost-integration-dhcp-centos-9:
39-
voting: false
4028
- bifrost-integration-dibipa-debian-ubuntu-jammy:
4129
voting: false
42-
- bifrost-integration-dibipa-debian-centos-9:
43-
voting: false
4430
- bifrost-cli-ubuntu-jammy:
4531
voting: false
4632
- bifrost-collections-src:
@@ -75,12 +61,12 @@
7561
- bifrost-integration-tinyipa-keystone-ubuntu-noble
7662
- bifrost-integration-tinyipa-keystone-ubuntu-jammy
7763
- bifrost-integration-tinyipa-debian-bookworm
78-
- bifrost-integration-tinyipa-debian-bullseye
7964
- bifrost-integration-redfish-vmedia-uefi-ubuntu-noble
8065
- bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
8166
- bifrost-integration-redfish-vmedia-uefi-debian-bookworm
8267
- bifrost-integration-inspector-ubuntu-jammy
8368
- bifrost-upgrade-ubuntu-jammy
69+
- bifrost-upgrade-keystone-ubuntu-noble
8470
experimental:
8571
jobs:
8672
- bifrost-benchmark-ironic

0 commit comments

Comments
 (0)