Merge pull request #695 from stackhpc/upstream/2024.1-2025-03-31

Synchronise 2024.1 with upstream

Author: priteau

ansible/roles/octavia/templates/octavia.conf.j2

@@ -1,3 +1,4 @@
+#jinja2: trim_blocks:False
 [DEFAULT]
 debug = {{ octavia_logging_debug }}
 

tests/setup_gate.sh

@@ -37,7 +37,7 @@ function prepare_images {
         GATE_IMAGES+=",^aodh,^tacker,^mistral,^redis,^barbican"
     fi
     if [[ $SCENARIO == "ironic" ]]; then
-        GATE_IMAGES+=",^dnsmasq,^ironic,^iscsid"
+        GATE_IMAGES+=",^dnsmasq,^ironic,^iscsid,^prometheus"
     fi
     if [[ $SCENARIO == "magnum" ]]; then
         GATE_IMAGES+=",^designate,^magnum,^trove"

zuul.d/jobs.yaml

@@ -150,19 +150,6 @@
       is_upgrade: yes
       tls_enabled: true
 
-- job:
-    name: kolla-ansible-rocky9-slurp-upgrade
-    parent: kolla-ansible-base
-    nodeset: kolla-ansible-rocky9
-    timeout: 9000
-    branches: master
-    vars:
-      base_distro: rocky
-      is_upgrade: yes
-      is_slurp: yes
-      previous_release: 2023.1
-      tls_enabled: true
-
 - job:
     name: kolla-ansible-debian-upgrade
     parent: kolla-ansible-base
@@ -173,19 +160,6 @@
       is_upgrade: yes
       tls_enabled: true
 
-- job:
-    name: kolla-ansible-debian-slurp-upgrade
-    parent: kolla-ansible-base
-    nodeset: kolla-ansible-debian-bullseye
-    timeout: 9000
-    branches: master
-    vars:
-      base_distro: debian
-      is_upgrade: yes
-      is_slurp: yes
-      previous_release: 2023.1
-      tls_enabled: true
-
 - job:
     name: kolla-ansible-debian-upgrade-aarch64
     parent: kolla-ansible-debian-upgrade
@@ -202,19 +176,6 @@
       is_upgrade: yes
       tls_enabled: true
 
-- job:
-    name: kolla-ansible-ubuntu-slurp-upgrade
-    parent: kolla-ansible-base
-    nodeset: kolla-ansible-jammy
-    timeout: 9000
-    branches: master
-    vars:
-      base_distro: ubuntu
-      is_upgrade: yes
-      is_slurp: yes
-      previous_release: 2023.1
-      tls_enabled: true
-
 - job:
     name: kolla-ansible-rocky9-upgrade-cephadm
     parent: kolla-ansible-cephadm-base
@@ -224,18 +185,6 @@
       base_distro: rocky
       is_upgrade: yes
 
-- job:
-    name: kolla-ansible-rocky9-slurp-upgrade-cephadm
-    parent: kolla-ansible-cephadm-base
-    nodeset: kolla-ansible-rocky9-multi
-    timeout: 9000
-    branches: master
-    vars:
-      base_distro: rocky
-      is_upgrade: yes
-      is_slurp: yes
-      previous_release: 2023.1
-
 - job:
     name: kolla-ansible-ubuntu-upgrade-cephadm
     parent: kolla-ansible-cephadm-base
@@ -246,19 +195,6 @@
       is_upgrade: yes
       cephadm_use_package_from_distribution: true
 
-- job:
-    name: kolla-ansible-ubuntu-slurp-upgrade-cephadm
-    parent: kolla-ansible-cephadm-base
-    nodeset: kolla-ansible-jammy-multi
-    timeout: 9000
-    branches: master
-    vars:
-      base_distro: ubuntu
-      is_upgrade: yes
-      is_slurp: yes
-      previous_release: 2023.1
-      cephadm_use_package_from_distribution: true
-
 - job:
     name: kolla-ansible-rocky9-upgrade-ovn
     parent: kolla-ansible-ovn-base

zuul.d/project.yaml

@@ -39,11 +39,8 @@
         - kolla-ansible-debian-ironic
         - kolla-ansible-ubuntu-ironic
         - kolla-ansible-rocky9-upgrade
-        - kolla-ansible-rocky9-slurp-upgrade
         - kolla-ansible-debian-upgrade
-        - kolla-ansible-debian-slurp-upgrade
         - kolla-ansible-ubuntu-upgrade
-        - kolla-ansible-ubuntu-slurp-upgrade
         - kolla-ansible-ubuntu-cells
         - kolla-ansible-rocky9-cells
         - kolla-ansible-rocky9-mariadb
@@ -64,9 +61,7 @@
         - kolla-ansible-rocky9-cephadm
         - kolla-ansible-ubuntu-cephadm
         - kolla-ansible-rocky9-upgrade-cephadm
-        - kolla-ansible-rocky9-slurp-upgrade-cephadm
         - kolla-ansible-ubuntu-upgrade-cephadm
-        - kolla-ansible-ubuntu-slurp-upgrade-cephadm
         - kolla-ansible-rocky9-hashi-vault
         - kolla-ansible-rocky9-haproxy-fqdn
         - kolla-ansible-ubuntu-haproxy-fqdn