Skip to content

Commit 0872ab5

Browse files
committed
CI: add rocky10 upgrade jobs
Change-Id: I6042cf9ebf1251e1f516201e3bc3068acc613471 Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
1 parent f465ecd commit 0872ab5

File tree

7 files changed

+56
-20
lines changed

7 files changed

+56
-20
lines changed

tests/templates/globals-default.j2

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ enable_barbican: "yes"
118118
enable_heat: "yes"
119119
# NOTE(yoctozepto): see https://bugs.launchpad.net/kolla-ansible/+bug/1906299
120120
enable_aodh: "yes"
121-
# TODO(gkoper): Remove after G/2026.1 release
122-
{% if is_previous_release %}
123-
enable_redis: "yes"
124-
{% endif %}
125121
{% endif %}
126122

127123
{% if scenario == "ironic" %}
@@ -166,10 +162,6 @@ nova_backend_ceph: "yes"
166162
rabbitmq_cluster_partition_handling: "autoheal"
167163
rabbitmq_extra_config:
168164
cluster_keepalive_interval: 50000
169-
# TODO(gkoper): Remove after G/2026.1 release
170-
{% if is_previous_release %}
171-
enable_redis: "yes"
172-
{% endif %}
173165

174166
enable_ceph_rgw: "yes"
175167
ceph_rgw_hosts:
@@ -204,10 +196,6 @@ enable_octavia: "yes"
204196
octavia_provider_drivers: "ovn:OVN provider"
205197
octavia_provider_agents: "ovn"
206198
neutron_dns_domain: "example.org."
207-
# TODO(gkoper): Remove after G/2026.1 release
208-
{% if is_previous_release %}
209-
enable_redis: "yes"
210-
{% endif %}
211199
{% endif %}
212200

213201
{% if scenario == "prometheus-opensearch" %}
@@ -240,10 +228,6 @@ octavia_amp_flavor:
240228
disk: 5
241229
octavia_network_type: "tenant"
242230
enable_valkey: "yes"
243-
# TODO(gkoper): Remove after G/2026.1 release
244-
{% if is_previous_release %}
245-
enable_redis: "yes"
246-
{% endif %}
247231
{% endif %}
248232

249233
{% if groups['all'] | length == 1 %}

zuul.d/scenarios/aio.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@
7979
parent: kolla-ansible-aio-base
8080
nodeset: kolla-ansible-rocky-10-16GB
8181

82+
- job:
83+
name: kolla-ansible-rocky-10-upgrade
84+
parent: kolla-ansible-aio-base
85+
nodeset: kolla-ansible-rocky-10-16GB
86+
timeout: 10800
87+
8288
- job:
8389
name: kolla-ansible-rocky-10-podman
8490
parent: kolla-ansible-rocky-10
@@ -121,6 +127,7 @@
121127
- kolla-ansible-debian-bookworm-podman
122128
- kolla-ansible-debian-bookworm-upgrade
123129
- kolla-ansible-rocky-10
130+
- kolla-ansible-rocky-10-upgrade
124131
- kolla-ansible-rocky-10-podman
125132
- kolla-ansible-ubuntu-noble
126133
- kolla-ansible-ubuntu-noble-podman
@@ -137,6 +144,7 @@
137144
- kolla-ansible-debian-bookworm-podman
138145
- kolla-ansible-debian-bookworm-upgrade
139146
- kolla-ansible-rocky-10
147+
- kolla-ansible-rocky-10-upgrade
140148
- kolla-ansible-rocky-10-podman
141149
- kolla-ansible-ubuntu-noble
142150
- kolla-ansible-ubuntu-noble-upgrade

zuul.d/scenarios/cephadm.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
nodeset: kolla-ansible-debian-bookworm-multi-16GB
3737
timeout: 9000
3838

39+
- job:
40+
name: kolla-ansible-rocky-10-cephadm
41+
parent: kolla-ansible-cephadm-base
42+
nodeset: kolla-ansible-rocky-10-multi-16GB
43+
timeout: 10800
44+
vars:
45+
cephadm_use_package_from_distribution: true
46+
47+
- job:
48+
name: kolla-ansible-rocky-10-cephadm-upgrade
49+
parent: kolla-ansible-rocky-10-cephadm
50+
nodeset: kolla-ansible-rocky-10-multi-16GB
51+
timeout: 10800
52+
3953
- job:
4054
name: kolla-ansible-ubuntu-noble-cephadm
4155
parent: kolla-ansible-cephadm-base
@@ -64,5 +78,7 @@
6478
jobs:
6579
- kolla-ansible-debian-bookworm-cephadm
6680
- kolla-ansible-debian-bookworm-cephadm-upgrade
81+
- kolla-ansible-rocky-10-cephadm
82+
- kolla-ansible-rocky-10-cephadm-upgrade
6783
- kolla-ansible-ubuntu-noble-cephadm
6884
- kolla-ansible-ubuntu-noble-cephadm-upgrade

zuul.d/scenarios/ironic.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
parent: kolla-ansible-ironic-base
3838
nodeset: kolla-ansible-rocky-10-16GB
3939

40+
- job:
41+
name: kolla-ansible-rocky-10-ironic-upgrade
42+
parent: kolla-ansible-rocky-10-ironic
43+
nodeset: kolla-ansible-rocky-10-16GB
44+
4045
- job:
4146
name: kolla-ansible-ubuntu-noble-ironic
4247
parent: kolla-ansible-ironic-base
@@ -56,5 +61,6 @@
5661
- kolla-ansible-debian-bookworm-ironic
5762
- kolla-ansible-debian-bookworm-ironic-upgrade
5863
- kolla-ansible-rocky-10-ironic
64+
- kolla-ansible-rocky-10-ironic-upgrade
5965
- kolla-ansible-ubuntu-noble-ironic
6066
- kolla-ansible-ubuntu-noble-ironic-upgrade

zuul.d/scenarios/mariadb.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,17 @@
2727
name: kolla-ansible-debian-bookworm-mariadb-upgrade
2828
parent: kolla-ansible-mariadb-base
2929
nodeset: kolla-ansible-debian-bookworm-multi-16GB
30-
vars:
31-
is_upgrade: true
3230

3331
- job:
3432
name: kolla-ansible-rocky-10-mariadb
3533
parent: kolla-ansible-mariadb-base
3634
nodeset: kolla-ansible-rocky-10-multi-16GB
3735

36+
- job:
37+
name: kolla-ansible-rocky-10-mariadb-upgrade
38+
parent: kolla-ansible-mariadb-base
39+
nodeset: kolla-ansible-rocky-10-multi-16GB
40+
3841
- job:
3942
name: kolla-ansible-ubuntu-noble-mariadb
4043
parent: kolla-ansible-mariadb-base
@@ -44,8 +47,6 @@
4447
name: kolla-ansible-ubuntu-noble-mariadb-upgrade
4548
parent: kolla-ansible-mariadb-base
4649
nodeset: kolla-ansible-ubuntu-noble-multi-8GB
47-
vars:
48-
is_upgrade: true
4950

5051
- project-template:
5152
name: kolla-ansible-scenario-mariadb
@@ -56,12 +57,14 @@
5657
- kolla-ansible-debian-bookworm-mariadb
5758
- kolla-ansible-debian-bookworm-mariadb-upgrade
5859
- kolla-ansible-rocky-10-mariadb
60+
- kolla-ansible-rocky-10-mariadb-upgrade
5961
- kolla-ansible-ubuntu-noble-mariadb
6062
- kolla-ansible-ubuntu-noble-mariadb-upgrade
6163
gate:
6264
jobs:
6365
- kolla-ansible-debian-bookworm-mariadb
6466
- kolla-ansible-debian-bookworm-mariadb-upgrade
6567
- kolla-ansible-rocky-10-mariadb
68+
- kolla-ansible-rocky-10-mariadb-upgrade
6669
- kolla-ansible-ubuntu-noble-mariadb
6770
- kolla-ansible-ubuntu-noble-mariadb-upgrade

zuul.d/scenarios/ovn.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,17 @@
2626
nodeset: kolla-ansible-debian-bookworm-multi-16GB
2727
timeout: 10800
2828

29+
- job:
30+
name: kolla-ansible-rocky-10-ovn
31+
parent: kolla-ansible-ovn-base
32+
nodeset: kolla-ansible-rocky-10-multi-16GB
33+
34+
- job:
35+
name: kolla-ansible-rocky-10-ovn-upgrade
36+
parent: kolla-ansible-rocky-10-ovn
37+
nodeset: kolla-ansible-rocky-10-multi-16GB
38+
timeout: 10800
39+
2940
- job:
3041
name: kolla-ansible-ubuntu-noble-ovn
3142
parent: kolla-ansible-ovn-base
@@ -45,5 +56,7 @@
4556
jobs:
4657
- kolla-ansible-debian-bookworm-ovn
4758
- kolla-ansible-debian-bookworm-ovn-upgrade
59+
- kolla-ansible-rocky-10-ovn
60+
- kolla-ansible-rocky-10-ovn-upgrade
4861
- kolla-ansible-ubuntu-noble-ovn
4962
- kolla-ansible-ubuntu-noble-ovn-upgrade

zuul.d/scenarios/prometheus-opensearch.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
parent: kolla-ansible-prometheus-opensearch-base
3939
nodeset: kolla-ansible-rocky-10-8GB
4040

41+
- job:
42+
name: kolla-ansible-rocky-10-prometheus-opensearch-upgrade
43+
parent: kolla-ansible-rocky-10-prometheus-opensearch
44+
nodeset: kolla-ansible-rocky-10-8GB
45+
4146
- job:
4247
name: kolla-ansible-ubuntu-noble-prometheus-opensearch
4348
parent: kolla-ansible-prometheus-opensearch-base
@@ -57,5 +62,6 @@
5762
- kolla-ansible-debian-bookworm-prometheus-opensearch
5863
- kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade
5964
- kolla-ansible-rocky-10-prometheus-opensearch
65+
- kolla-ansible-rocky-10-prometheus-opensearch-upgrade
6066
- kolla-ansible-ubuntu-noble-prometheus-opensearch
6167
- kolla-ansible-ubuntu-noble-prometheus-opensearch-upgrade

0 commit comments

Comments
 (0)