Merge pull request #472 from stackhpc/upstream/master-2025-09-29

Synchronise master with upstream

Author: priteau

.ansible-lint

@@ -1,7 +1,7 @@
 ---
 exclude_paths:
   - .cache/  # implicit unless exclude_paths is defined in config
-  - .zuul.d/
+  - zuul.d/
 offline: true
 parseable: true
 profile: basic

.zuul.d/centos.yaml

@@ -252,6 +252,10 @@ if [[ ! -d "/var/log/kolla/horizon" ]]; then
     mkdir -p /var/log/kolla/horizon
 fi
 
+if [[ $(stat -c %U:%G /var/log/kolla/horizon) != "horizon:kolla" ]]; then
+    chown -R horizon:kolla /var/log/kolla/horizon
+fi
+
 if [[ $(stat -c %a /var/log/kolla/horizon) != "755" ]]; then
     chmod 755 /var/log/kolla/horizon
 fi

.zuul.d/debian.yaml

@@ -27,6 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'pcre2-devel',
         'postgresql',
         'postgresql-devel',
+        'postgresql-server-devel',
         'python3-devel',
         'python3-mod_wsgi',
         'sqlite-devel',

.zuul.d/project.yaml

@@ -37,7 +37,7 @@
     'rocky': 'Rocky Linux 9.* (Blue Onyx)',
     'ubuntu': 'Ubuntu 24.04.* LTS',
 }
-OPENSTACK_RELEASE = 'master'
+OPENSTACK_RELEASE = '2025.2'
 
 # TODO(mandre) check for file integrity instead of downloading from an HTTPS
 # source

.zuul.d/tox.yaml

@@ -0,0 +1,48 @@
+---
+- job:
+    name: kolla-base
+    parent: base
+    timeout: 10800
+    post-timeout: 10800
+    pre-run: tests/playbooks/pre.yml
+    run: tests/playbooks/run.yml
+    post-run: tests/playbooks/post.yml
+    attempts: 5
+    roles:
+      - zuul: openstack/ansible-collection-kolla
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*
+      - ^etc/.*
+      - ^releasenotes/.*$
+      - ^specs/.*$
+      - ^test-requirements.txt$
+      - ^\.zuul\.d/
+      - ^\..+
+      - ^contrib/
+      - ^LICENSE$
+      - ^tox\.ini$
+    vars:
+      base_arch: "x86_64"
+      publisher: false
+      container_engine: "docker"
+    extra-vars:
+      kolla_logs_dir: "{{ zuul_output_dir }}/logs/kolla"
+      kolla_build_logs_dir: "{{ kolla_logs_dir }}/build"
+      virtualenv_path: "/tmp/kolla-virtualenv"
+      kolla_build_template_overrides_path: "{{ zuul.executor.work_root }}/\
+      {{ zuul.projects['opendev.org/openstack/kolla'].src_dir }}\
+      /tests/templates/template_overrides.j2"
+
+- job:
+    name: kolla-base-podman
+    parent: kolla-base
+    vars:
+      container_engine: "podman"
+      configure_ephemeral_mountpoint: "/var/lib/containers"
+
+- job:
+    name: kolla-build-no-infra-wheels-base
+    parent: kolla-base
+    vars:
+      use_infra_wheels_mirror: false