aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/templates/globals-default.j216
-rw-r--r--zuul.d/scenarios/aio.yaml8
-rw-r--r--zuul.d/scenarios/cephadm.yaml16
-rw-r--r--zuul.d/scenarios/ironic.yaml6
-rw-r--r--zuul.d/scenarios/mariadb.yaml11
-rw-r--r--zuul.d/scenarios/ovn.yaml13
-rw-r--r--zuul.d/scenarios/prometheus-opensearch.yaml6
7 files changed, 56 insertions, 20 deletions
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 77e050e9f..57ad30293 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -118,10 +118,6 @@ enable_barbican: "yes"
enable_heat: "yes"
# NOTE(yoctozepto): see https://bugs.launchpad.net/kolla-ansible/+bug/1906299
enable_aodh: "yes"
-# TODO(gkoper): Remove after G/2026.1 release
-{% if is_previous_release %}
-enable_redis: "yes"
-{% endif %}
{% endif %}
{% if scenario == "ironic" %}
@@ -166,10 +162,6 @@ nova_backend_ceph: "yes"
rabbitmq_cluster_partition_handling: "autoheal"
rabbitmq_extra_config:
cluster_keepalive_interval: 50000
-# TODO(gkoper): Remove after G/2026.1 release
-{% if is_previous_release %}
-enable_redis: "yes"
-{% endif %}
enable_ceph_rgw: "yes"
ceph_rgw_hosts:
@@ -204,10 +196,6 @@ enable_octavia: "yes"
octavia_provider_drivers: "ovn:OVN provider"
octavia_provider_agents: "ovn"
neutron_dns_domain: "example.org."
-# TODO(gkoper): Remove after G/2026.1 release
-{% if is_previous_release %}
-enable_redis: "yes"
-{% endif %}
{% endif %}
{% if scenario == "prometheus-opensearch" %}
@@ -240,10 +228,6 @@ octavia_amp_flavor:
disk: 5
octavia_network_type: "tenant"
enable_valkey: "yes"
-# TODO(gkoper): Remove after G/2026.1 release
-{% if is_previous_release %}
-enable_redis: "yes"
-{% endif %}
{% endif %}
{% if groups['all'] | length == 1 %}
diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml
index 384a06b27..cb292e522 100644
--- a/zuul.d/scenarios/aio.yaml
+++ b/zuul.d/scenarios/aio.yaml
@@ -80,6 +80,12 @@
nodeset: kolla-ansible-rocky-10-16GB
- job:
+ name: kolla-ansible-rocky-10-upgrade
+ parent: kolla-ansible-aio-base
+ nodeset: kolla-ansible-rocky-10-16GB
+ timeout: 10800
+
+- job:
name: kolla-ansible-rocky-10-podman
parent: kolla-ansible-rocky-10
nodeset: kolla-ansible-rocky-10-16GB
@@ -121,6 +127,7 @@
- kolla-ansible-debian-bookworm-podman
- kolla-ansible-debian-bookworm-upgrade
- kolla-ansible-rocky-10
+ - kolla-ansible-rocky-10-upgrade
- kolla-ansible-rocky-10-podman
- kolla-ansible-ubuntu-noble
- kolla-ansible-ubuntu-noble-podman
@@ -137,6 +144,7 @@
- kolla-ansible-debian-bookworm-podman
- kolla-ansible-debian-bookworm-upgrade
- kolla-ansible-rocky-10
+ - kolla-ansible-rocky-10-upgrade
- kolla-ansible-rocky-10-podman
- kolla-ansible-ubuntu-noble
- kolla-ansible-ubuntu-noble-upgrade
diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml
index 2120af30e..3df106c99 100644
--- a/zuul.d/scenarios/cephadm.yaml
+++ b/zuul.d/scenarios/cephadm.yaml
@@ -37,6 +37,20 @@
timeout: 9000
- job:
+ name: kolla-ansible-rocky-10-cephadm
+ parent: kolla-ansible-cephadm-base
+ nodeset: kolla-ansible-rocky-10-multi-16GB
+ timeout: 10800
+ vars:
+ cephadm_use_package_from_distribution: true
+
+- job:
+ name: kolla-ansible-rocky-10-cephadm-upgrade
+ parent: kolla-ansible-rocky-10-cephadm
+ nodeset: kolla-ansible-rocky-10-multi-16GB
+ timeout: 10800
+
+- job:
name: kolla-ansible-ubuntu-noble-cephadm
parent: kolla-ansible-cephadm-base
nodeset: kolla-ansible-ubuntu-noble-multi-16GB
@@ -64,5 +78,7 @@
jobs:
- kolla-ansible-debian-bookworm-cephadm
- kolla-ansible-debian-bookworm-cephadm-upgrade
+ - kolla-ansible-rocky-10-cephadm
+ - kolla-ansible-rocky-10-cephadm-upgrade
- kolla-ansible-ubuntu-noble-cephadm
- kolla-ansible-ubuntu-noble-cephadm-upgrade
diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml
index ee2000557..6f468cc95 100644
--- a/zuul.d/scenarios/ironic.yaml
+++ b/zuul.d/scenarios/ironic.yaml
@@ -38,6 +38,11 @@
nodeset: kolla-ansible-rocky-10-16GB
- job:
+ name: kolla-ansible-rocky-10-ironic-upgrade
+ parent: kolla-ansible-rocky-10-ironic
+ nodeset: kolla-ansible-rocky-10-16GB
+
+- job:
name: kolla-ansible-ubuntu-noble-ironic
parent: kolla-ansible-ironic-base
nodeset: kolla-ansible-ubuntu-noble-16GB
@@ -56,5 +61,6 @@
- kolla-ansible-debian-bookworm-ironic
- kolla-ansible-debian-bookworm-ironic-upgrade
- kolla-ansible-rocky-10-ironic
+ - kolla-ansible-rocky-10-ironic-upgrade
- kolla-ansible-ubuntu-noble-ironic
- kolla-ansible-ubuntu-noble-ironic-upgrade
diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml
index 3e540e93a..8ce92f6e6 100644
--- a/zuul.d/scenarios/mariadb.yaml
+++ b/zuul.d/scenarios/mariadb.yaml
@@ -27,8 +27,6 @@
name: kolla-ansible-debian-bookworm-mariadb-upgrade
parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-debian-bookworm-multi-16GB
- vars:
- is_upgrade: true
- job:
name: kolla-ansible-rocky-10-mariadb
@@ -36,6 +34,11 @@
nodeset: kolla-ansible-rocky-10-multi-16GB
- job:
+ name: kolla-ansible-rocky-10-mariadb-upgrade
+ parent: kolla-ansible-mariadb-base
+ nodeset: kolla-ansible-rocky-10-multi-16GB
+
+- job:
name: kolla-ansible-ubuntu-noble-mariadb
parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-ubuntu-noble-multi-8GB
@@ -44,8 +47,6 @@
name: kolla-ansible-ubuntu-noble-mariadb-upgrade
parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-ubuntu-noble-multi-8GB
- vars:
- is_upgrade: true
- project-template:
name: kolla-ansible-scenario-mariadb
@@ -56,6 +57,7 @@
- kolla-ansible-debian-bookworm-mariadb
- kolla-ansible-debian-bookworm-mariadb-upgrade
- kolla-ansible-rocky-10-mariadb
+ - kolla-ansible-rocky-10-mariadb-upgrade
- kolla-ansible-ubuntu-noble-mariadb
- kolla-ansible-ubuntu-noble-mariadb-upgrade
gate:
@@ -63,5 +65,6 @@
- kolla-ansible-debian-bookworm-mariadb
- kolla-ansible-debian-bookworm-mariadb-upgrade
- kolla-ansible-rocky-10-mariadb
+ - kolla-ansible-rocky-10-mariadb-upgrade
- kolla-ansible-ubuntu-noble-mariadb
- kolla-ansible-ubuntu-noble-mariadb-upgrade
diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml
index 8ff50fbb9..b9a6b1be2 100644
--- a/zuul.d/scenarios/ovn.yaml
+++ b/zuul.d/scenarios/ovn.yaml
@@ -27,6 +27,17 @@
timeout: 10800
- job:
+ name: kolla-ansible-rocky-10-ovn
+ parent: kolla-ansible-ovn-base
+ nodeset: kolla-ansible-rocky-10-multi-16GB
+
+- job:
+ name: kolla-ansible-rocky-10-ovn-upgrade
+ parent: kolla-ansible-rocky-10-ovn
+ nodeset: kolla-ansible-rocky-10-multi-16GB
+ timeout: 10800
+
+- job:
name: kolla-ansible-ubuntu-noble-ovn
parent: kolla-ansible-ovn-base
nodeset: kolla-ansible-ubuntu-noble-multi-16GB
@@ -45,5 +56,7 @@
jobs:
- kolla-ansible-debian-bookworm-ovn
- kolla-ansible-debian-bookworm-ovn-upgrade
+ - kolla-ansible-rocky-10-ovn
+ - kolla-ansible-rocky-10-ovn-upgrade
- kolla-ansible-ubuntu-noble-ovn
- kolla-ansible-ubuntu-noble-ovn-upgrade
diff --git a/zuul.d/scenarios/prometheus-opensearch.yaml b/zuul.d/scenarios/prometheus-opensearch.yaml
index f17d34f7d..66ded1aeb 100644
--- a/zuul.d/scenarios/prometheus-opensearch.yaml
+++ b/zuul.d/scenarios/prometheus-opensearch.yaml
@@ -39,6 +39,11 @@
nodeset: kolla-ansible-rocky-10-8GB
- job:
+ name: kolla-ansible-rocky-10-prometheus-opensearch-upgrade
+ parent: kolla-ansible-rocky-10-prometheus-opensearch
+ nodeset: kolla-ansible-rocky-10-8GB
+
+- job:
name: kolla-ansible-ubuntu-noble-prometheus-opensearch
parent: kolla-ansible-prometheus-opensearch-base
nodeset: kolla-ansible-ubuntu-noble-8GB
@@ -57,5 +62,6 @@
- kolla-ansible-debian-bookworm-prometheus-opensearch
- kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade
- kolla-ansible-rocky-10-prometheus-opensearch
+ - kolla-ansible-rocky-10-prometheus-opensearch-upgrade
- kolla-ansible-ubuntu-noble-prometheus-opensearch
- kolla-ansible-ubuntu-noble-prometheus-opensearch-upgrade
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 16:09:27 +0000