aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.ansible-lint2
-rw-r--r--.zuul.d/centos.yaml36
-rw-r--r--.zuul.d/debian.yaml82
-rw-r--r--.zuul.d/project.yaml16
-rw-r--r--.zuul.d/tox.yaml12
-rw-r--r--.zuul.d/ubuntu.yaml103
-rw-r--r--zuul.d/base.yaml48
-rw-r--r--zuul.d/centos.yaml37
-rw-r--r--zuul.d/debian.yaml78
-rw-r--r--zuul.d/nodesets.yaml36
-rw-r--r--zuul.d/periodics/copr.yaml17
-rw-r--r--zuul.d/project.yaml27
-rw-r--r--zuul.d/scenarios/aio.yaml22
-rw-r--r--zuul.d/scenarios/bifrost.yaml11
-rw-r--r--zuul.d/scenarios/cells.yaml11
-rw-r--r--zuul.d/scenarios/cephadm.yaml15
-rw-r--r--zuul.d/scenarios/ironic.yaml11
-rw-r--r--zuul.d/scenarios/mariadb.yaml11
-rw-r--r--zuul.d/scenarios/masakari.yaml11
-rw-r--r--zuul.d/scenarios/octavia.yaml11
-rw-r--r--zuul.d/scenarios/ovn.yaml11
-rw-r--r--zuul.d/secrets.yaml (renamed from .zuul.d/base.yaml)97
-rw-r--r--zuul.d/tox.yaml23
-rw-r--r--zuul.d/ubuntu.yaml65
24 files changed, 446 insertions, 347 deletions
diff --git a/.ansible-lint b/.ansible-lint
index a335f1800..a46703146 100644
--- a/.ansible-lint
+++ b/.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
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
deleted file mode 100644
index 180688f2d..000000000
--- a/.zuul.d/centos.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
- check:
- jobs:
- - kolla-build-centos10s
- - kolla-ansible-centos10s
- check-arm64:
- jobs:
- - kolla-build-centos10s-aarch64
- - kolla-ansible-centos10s-aarch64
- experimental:
- jobs:
- - kolla-build-no-infra-wheels-centos10s
-
-- job:
- name: kolla-build-centos10s
- parent: kolla-base
- nodeset: kolla-centos-10-stream
- vars:
- base_distro: centos
- voting: false
-
-- job:
- name: kolla-build-centos10s-aarch64
- parent: kolla-build-centos10s
- nodeset: kolla-centos-10-stream-aarch64
- vars:
- base_arch: aarch64
- voting: false
-
-- job:
- name: kolla-build-no-infra-wheels-centos10s
- parent: kolla-build-no-infra-wheels-base
- nodeset: kolla-centos-10-stream
- vars:
- base_distro: centos \ No newline at end of file
diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
deleted file mode 100644
index adfb3811e..000000000
--- a/.zuul.d/debian.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-- project:
- check:
- jobs:
- - kolla-build-debian
- - kolla-build-debian-podman
- - kolla-ansible-debian
- - kolla-ansible-debian-upgrade
- check-arm64:
- jobs:
- - kolla-build-debian-aarch64
- - kolla-ansible-debian-aarch64
- gate:
- jobs:
- - kolla-build-debian
- - kolla-build-debian-podman
- - kolla-ansible-debian
- - kolla-ansible-debian-upgrade
- periodic:
- jobs:
- - kolla-publish-debian-quay
- - kolla-publish-debian-aarch64-quay
- experimental:
- jobs:
- - kolla-build-no-infra-wheels-debian
- - kolla-ansible-debian-ironic:
- files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
-
-- job:
- name: kolla-build-debian
- parent: kolla-base
- nodeset: kolla-debian-bookworm
- vars:
- base_distro: debian
- base_distro_version: bookworm
-
-- job:
- name: kolla-build-debian-podman
- parent: kolla-base-podman
- nodeset: kolla-debian-bookworm
- vars:
- base_distro: debian
- base_distro_version: bookworm
-
-- job:
- name: kolla-build-debian-aarch64
- parent: kolla-build-debian
- nodeset: kolla-debian-bookworm-aarch64
- voting: false
- vars:
- base_arch: aarch64
-
-- job:
- name: kolla-publish-debian-quay
- parent: kolla-build-debian
- post-run: tests/playbooks/publish.yml
- vars:
- publisher: true
- kolla_registry: quay.io
- kolla_namespace: openstack.kolla
- secrets:
- - kolla_quay_io_creds
- - kolla_quay_io_api
-
-- job:
- name: kolla-publish-debian-aarch64-quay
- parent: kolla-build-debian-aarch64
- post-run: tests/playbooks/publish.yml
- vars:
- publisher: true
- kolla_registry: quay.io
- kolla_namespace: openstack.kolla
- secrets:
- - kolla_quay_io_creds
- - kolla_quay_io_api
-
-- job:
- name: kolla-build-no-infra-wheels-debian
- parent: kolla-build-no-infra-wheels-base
- nodeset: kolla-debian-bookworm
- vars:
- base_distro: debian
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
deleted file mode 100644
index a93a1ef01..000000000
--- a/.zuul.d/project.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- templates:
- - check-requirements
- - openstack-python3-jobs
- - openstack-python3-jobs-arm64
- - openstack-cover-jobs
- - periodic-stable-jobs
- - publish-openstack-docs-pti
- - release-notes-jobs-python3
- check:
- jobs:
- - kolla-tox-genconfig
- gate:
- jobs:
- - kolla-tox-genconfig
diff --git a/.zuul.d/tox.yaml b/.zuul.d/tox.yaml
deleted file mode 100644
index fb52e06d4..000000000
--- a/.zuul.d/tox.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- job:
- name: kolla-tox-genconfig
- parent: openstack-tox
- timeout: 2400
- description: |
-
- Run genconfig
-
- Uses tox with the ``genconfig`` environment.
- vars:
- tox_envlist: genconfig
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
deleted file mode 100644
index e3fb84584..000000000
--- a/.zuul.d/ubuntu.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
----
-- project:
- check:
- jobs:
- - kolla-build-ubuntu
- - kolla-build-ubuntu-podman
- - kolla-ansible-ubuntu
- - kolla-ansible-ubuntu-upgrade
- # Test rabbitmq and mariadb in multinode ceph jobs.
- - kolla-ansible-ubuntu-cephadm:
- files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
- - kolla-ansible-ubuntu-upgrade-cephadm:
- files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
- - kolla-ansible-ubuntu-ironic:
- files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
- - kolla-ansible-ubuntu-swift:
- files: ^docker/(base|openstack-base|glance|swift)/
- - kolla-ansible-ubuntu-mariadb:
- files: ^docker/(base|mariadb)/
- - kolla-ansible-ubuntu-masakari:
- files: ^docker/(base|masakari|openstack-base)/
- - kolla-ansible-ubuntu-octavia:
- files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
- - kolla-ansible-ubuntu-ovn:
- files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
- - kolla-ansible-ubuntu-prometheus-opensearch:
- files: ^docker/(base|opensearch|fluentd|grafana|prometheus)/
- - kolla-ansible-ubuntu-kvm:
- files: ^docker/nova/
- - kolla-ansible-ubuntu-cells:
- files: ^docker/proxysql/
- - kolla-ansible-ubuntu-bifrost:
- files: ^docker/bifrost/
- check-arm64:
- jobs:
- - kolla-build-ubuntu-aarch64
- gate:
- jobs:
- - kolla-build-ubuntu
- - kolla-build-ubuntu-podman
- - kolla-ansible-ubuntu
- - kolla-ansible-ubuntu-upgrade
- periodic:
- jobs:
- - kolla-publish-ubuntu-quay
- periodic-weekly:
- jobs:
- - kolla-copr-erlang-update
- experimental:
- jobs:
- - kolla-build-no-infra-wheels-ubuntu
-
-- job:
- name: kolla-build-ubuntu
- parent: kolla-base
- nodeset: kolla-ubuntu-noble
- vars:
- base_distro: ubuntu
- base_distro_version: noble
-
-- job:
- name: kolla-build-ubuntu-podman
- parent: kolla-base-podman
- nodeset: kolla-ubuntu-noble
- vars:
- base_distro: ubuntu
- base_distro_version: noble
-
-- job:
- name: kolla-build-ubuntu-aarch64
- parent: kolla-build-ubuntu
- nodeset: kolla-ubuntu-noble-aarch64
- vars:
- base_arch: aarch64
- voting: false
-
-- job:
- name: kolla-publish-ubuntu-quay
- parent: kolla-build-ubuntu
- post-run: tests/playbooks/publish.yml
- vars:
- publisher: true
- kolla_registry: quay.io
- kolla_namespace: openstack.kolla
- secrets:
- - kolla_quay_io_creds
- - kolla_quay_io_api
-
-- job:
- name: kolla-build-no-infra-wheels-ubuntu
- parent: kolla-build-no-infra-wheels-base
- nodeset: kolla-ubuntu-noble
- vars:
- base_distro: ubuntu
-
-- job:
- name: kolla-copr-erlang-update
- parent: base
- nodeset: kolla-ubuntu-noble
- timeout: 3600
- run: tests/playbooks/copr-erlang-update.yml
- secrets:
- - kolla_copr_webhooks
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
new file mode 100644
index 000000000..0a3d48f87
--- /dev/null
+++ b/zuul.d/base.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
diff --git a/zuul.d/centos.yaml b/zuul.d/centos.yaml
new file mode 100644
index 000000000..e90ea4fa6
--- /dev/null
+++ b/zuul.d/centos.yaml
@@ -0,0 +1,37 @@
+---
+- job:
+ name: kolla-build-centos-10s
+ parent: kolla-base
+ nodeset: kolla-centos-10s-8GB
+ vars:
+ base_distro: centos
+ voting: false
+
+- job:
+ name: kolla-build-centos-10s-aarch64
+ parent: kolla-build-centos-10s
+ nodeset: kolla-centos-10s-aarch64-8GB
+ vars:
+ base_arch: aarch64
+ voting: false
+
+- job:
+ name: kolla-build-no-infra-wheels-centos-10s
+ parent: kolla-build-no-infra-wheels-base
+ nodeset: kolla-centos-10s-8GB
+ vars:
+ base_distro: centos
+
+- project-template:
+ name: kolla-build-centos
+ description: |
+ Runs Kolla CentOS build jobs.
+ check:
+ jobs:
+ - kolla-build-centos-10s
+ check-arm64:
+ jobs:
+ - kolla-build-centos-10s-aarch64
+ experimental:
+ jobs:
+ - kolla-build-no-infra-wheels-centos-10s
diff --git a/zuul.d/debian.yaml b/zuul.d/debian.yaml
new file mode 100644
index 000000000..931d169b6
--- /dev/null
+++ b/zuul.d/debian.yaml
@@ -0,0 +1,78 @@
+---
+- job:
+ name: kolla-build-debian-bookworm
+ parent: kolla-base
+ nodeset: kolla-debian-bookworm-8GB
+ vars:
+ base_distro: debian
+ base_distro_version: bookworm
+
+- job:
+ name: kolla-build-debian-bookworm-podman
+ parent: kolla-base-podman
+ nodeset: kolla-debian-bookworm-8GB
+ vars:
+ base_distro: debian
+ base_distro_version: bookworm
+
+- job:
+ name: kolla-build-debian-bookworm-aarch64
+ parent: kolla-build-debian-bookworm
+ nodeset: kolla-debian-bookworm-aarch64-8GB
+ voting: false
+ vars:
+ base_arch: aarch64
+
+- job:
+ name: kolla-publish-debian-bookworm-quay
+ parent: kolla-build-debian-bookworm
+ post-run: tests/playbooks/publish.yml
+ vars:
+ publisher: true
+ kolla_registry: quay.io
+ kolla_namespace: openstack.kolla
+ secrets:
+ - kolla_quay_io_creds
+ - kolla_quay_io_api
+
+- job:
+ name: kolla-publish-debian-bookworm-aarch64-quay
+ parent: kolla-build-debian-bookworm-aarch64
+ post-run: tests/playbooks/publish.yml
+ vars:
+ publisher: true
+ kolla_registry: quay.io
+ kolla_namespace: openstack.kolla
+ secrets:
+ - kolla_quay_io_creds
+ - kolla_quay_io_api
+
+- job:
+ name: kolla-build-no-infra-wheels-debian-bookworm
+ parent: kolla-build-no-infra-wheels-base
+ nodeset: kolla-debian-bookworm-8GB
+ vars:
+ base_distro: debian
+
+- project-template:
+ name: kolla-build-debian
+ description: |
+ Runs Kolla Debian build jobs.
+ check:
+ jobs:
+ - kolla-build-debian-bookworm
+ - kolla-build-debian-bookworm-podman
+ check-arm64:
+ jobs:
+ - kolla-build-debian-bookworm-aarch64
+ gate:
+ jobs:
+ - kolla-build-debian-bookworm
+ - kolla-build-debian-bookworm-podman
+ experimental:
+ jobs:
+ - kolla-build-no-infra-wheels-debian-bookworm
+ periodic:
+ jobs:
+ - kolla-publish-debian-bookworm-quay
+ - kolla-publish-debian-bookworm-aarch64-quay
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
new file mode 100644
index 000000000..89c346ba9
--- /dev/null
+++ b/zuul.d/nodesets.yaml
@@ -0,0 +1,36 @@
+---
+- nodeset:
+ name: kolla-centos-10s-8GB
+ nodes:
+ - name: primary
+ label: centos-10-stream-8GB
+
+- nodeset:
+ name: kolla-centos-10s-aarch64-8GB
+ nodes:
+ - name: primary
+ label: centos-10-stream-arm64-8GB
+
+- nodeset:
+ name: kolla-ubuntu-noble-8GB
+ nodes:
+ - name: primary
+ label: ubuntu-noble-8GB
+
+- nodeset:
+ name: kolla-debian-bookworm-8GB
+ nodes:
+ - name: primary
+ label: debian-bookworm-8GB
+
+- nodeset:
+ name: kolla-debian-bookworm-aarch64-8GB
+ nodes:
+ - name: primary
+ label: debian-bookworm-arm64-8GB
+
+- nodeset:
+ name: kolla-ubuntu-noble-aarch64-8GB
+ nodes:
+ - name: primary
+ label: ubuntu-noble-arm64-8GB
diff --git a/zuul.d/periodics/copr.yaml b/zuul.d/periodics/copr.yaml
new file mode 100644
index 000000000..77b99cf0f
--- /dev/null
+++ b/zuul.d/periodics/copr.yaml
@@ -0,0 +1,17 @@
+---
+- job:
+ name: kolla-copr-erlang-update
+ parent: base
+ nodeset: kolla-ubuntu-noble-8GB
+ timeout: 3600
+ run: tests/playbooks/copr-erlang-update.yml
+ secrets:
+ - kolla_copr_webhooks
+
+- project-template:
+ name: kolla-periodic-copr
+ description: |
+ Runs Kolla COPR repository refresh periodic jobs.
+ periodic-weekly:
+ jobs:
+ - kolla-copr-erlang-update
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
new file mode 100644
index 000000000..b90e6f393
--- /dev/null
+++ b/zuul.d/project.yaml
@@ -0,0 +1,27 @@
+---
+- project:
+ queue: kolla
+
+- project:
+ templates:
+ - check-requirements
+ - kolla-build-centos
+ - kolla-build-debian
+ - kolla-build-ubuntu
+ - kolla-periodic-copr
+ - kolla-scenario-aio
+ - kolla-scenario-bifrost
+ - kolla-scenario-cells
+ - kolla-scenario-cephadm
+ - kolla-scenario-ironic
+ - kolla-scenario-mariadb
+ - kolla-scenario-masakari
+ - kolla-scenario-octavia
+ - kolla-scenario-ovn
+ - kolla-tox-genconfig
+ - openstack-python3-jobs
+ - openstack-python3-jobs-arm64
+ - openstack-cover-jobs
+ - periodic-stable-jobs
+ - publish-openstack-docs-pti
+ - release-notes-jobs-python3
diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml
new file mode 100644
index 000000000..ee58ed05d
--- /dev/null
+++ b/zuul.d/scenarios/aio.yaml
@@ -0,0 +1,22 @@
+---
+- project-template:
+ name: kolla-scenario-aio
+ description: |
+ Runs Kolla-Ansible AIO jobs on all Kolla changes.
+ check:
+ jobs:
+ - kolla-ansible-centos-10s
+ - kolla-ansible-debian-bookworm
+ - kolla-ansible-debian-bookworm-upgrade
+ - kolla-ansible-ubuntu-noble
+ - kolla-ansible-ubuntu-noble-upgrade
+ check-arm64:
+ jobs:
+ - kolla-ansible-centos-10s-aarch64
+ - kolla-ansible-debian-bookworm-aarch64
+ gate:
+ jobs:
+ - kolla-ansible-debian-bookworm
+ - kolla-ansible-debian-bookworm-upgrade
+ - kolla-ansible-ubuntu-noble
+ - kolla-ansible-ubuntu-noble-upgrade
diff --git a/zuul.d/scenarios/bifrost.yaml b/zuul.d/scenarios/bifrost.yaml
new file mode 100644
index 000000000..4c4dd5465
--- /dev/null
+++ b/zuul.d/scenarios/bifrost.yaml
@@ -0,0 +1,11 @@
+---
+- project-template:
+ name: kolla-scenario-bifrost
+ description: |
+ Runs Kolla-Ansible Bifrost scenario jobs on particular Kolla changes.
+ check:
+ jobs:
+ - kolla-ansible-debian-bookworm-bifrost:
+ files: ^docker/bifrost/
+ - kolla-ansible-ubuntu-noble-bifrost:
+ files: ^docker/bifrost/
diff --git a/zuul.d/scenarios/cells.yaml b/zuul.d/scenarios/cells.yaml
new file mode 100644
index 000000000..4105c48ed
--- /dev/null
+++ b/zuul.d/scenarios/cells.yaml
@@ -0,0 +1,11 @@
+---
+- project-template:
+ name: kolla-scenario-cells
+ description: |
+ Runs Kolla-Ansible Nova Cells scenario jobs on particular Kolla changes.
+ check:
+ jobs:
+ - kolla-ansible-debian-bookworm-cells:
+ files: ^docker/proxysql/
+ - kolla-ansible-ubuntu-noble-cells:
+ files: ^docker/proxysql/
diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml
new file mode 100644
index 000000000..1a56c81ff
--- /dev/null
+++ b/zuul.d/scenarios/cephadm.yaml
@@ -0,0 +1,15 @@
+---
+- project-template:
+ name: kolla-scenario-cephadm
+ description: |
+ Runs Kolla-Ansible CephAdm scenario jobs on particular Kolla changes.
+ check:
+ jobs:
+ - kolla-ansible-debian-bookworm-cephadm:
+ files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+ - kolla-ansible-debian-bookworm-cephadm-upgrade:
+ files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+ - kolla-ansible-ubuntu-noble-cephadm:
+ files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+ - kolla-ansible-ubuntu-noble-cephadm-upgrade:
+ files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml
new file mode 100644
index 000000000..4484ccd7f
--- /dev/null
+++ b/zuul.d/scenarios/ironic.yaml
@@ -0,0 +1,11 @@
+---
+- project-template:
+ name: kolla-scenario-ironic
+ description: |
+ Runs Kolla-Ansible Ironic scenario jobs on particular Kolla changes.
+ check:
+ jobs:
+ - kolla-ansible-debian-bookworm-ironic:
+ files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
+ - kolla-ansible-ubuntu-noble-ironic:
+ files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml
new file mode 100644
index 000000000..42b4535df
--- /dev/null
+++ b/zuul.d/scenarios/mariadb.yaml
@@ -0,0 +1,11 @@
+---
+- project-template:
+ name: kolla-scenario-mariadb
+ description: |
+ Runs Kolla-Ansible MariaDB scenario jobs on particular Kolla changes.
+ check:
+ jobs:
+ - kolla-ansible-debian-bookworm-mariadb:
+ files: ^docker/(base|mariadb)/
+ - kolla-ansible-ubuntu-noble-mariadb:
+ files: ^docker/(base|mariadb)/
diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml
new file mode 100644
index 000000000..81c8e84dd
--- /dev/null
+++ b/zuul.d/scenarios/masakari.yaml
@@ -0,0 +1,11 @@
+---
+- project-template:
+ name: kolla-scenario-masakari
+ description: |
+ Runs Kolla-Ansible Masakari scenario jobs on particular Kolla changes.
+ check:
+ jobs:
+ - kolla-ansible-debian-bookworm-masakari:
+ files: ^docker/(base|masakari|openstack-base)/
+ - kolla-ansible-ubuntu-noble-masakari:
+ files: ^docker/(base|masakari|openstack-base)/
diff --git a/zuul.d/scenarios/octavia.yaml b/zuul.d/scenarios/octavia.yaml
new file mode 100644
index 000000000..e708090f2
--- /dev/null
+++ b/zuul.d/scenarios/octavia.yaml
@@ -0,0 +1,11 @@
+---
+- project-template:
+ name: kolla-scenario-octavia
+ description: |
+ Runs Kolla-Ansible Octavia scenario jobs on particular Kolla changes.
+ check:
+ jobs:
+ - kolla-ansible-debian-bookworm-octavia:
+ files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
+ - kolla-ansible-ubuntu-noble-octavia:
+ files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml
new file mode 100644
index 000000000..1ca2a1d22
--- /dev/null
+++ b/zuul.d/scenarios/ovn.yaml
@@ -0,0 +1,11 @@
+---
+- project-template:
+ name: kolla-scenario-ovn
+ description: |
+ Runs Kolla-Ansible OVN scenario jobs on particular Kolla changes.
+ check:
+ jobs:
+ - kolla-ansible-debian-bookworm-ovn:
+ files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
+ - kolla-ansible-ubuntu-noble-ovn:
+ files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
diff --git a/.zuul.d/base.yaml b/zuul.d/secrets.yaml
index 734776f90..ed2f2be69 100644
--- a/.zuul.d/base.yaml
+++ b/zuul.d/secrets.yaml
@@ -1,7 +1,4 @@
---
-- project:
- queue: kolla
-
- secret:
name: kolla_quay_io_creds
data:
@@ -67,97 +64,3 @@
vOcjgITfjJwmkzhmBC+jkPBlIKK/T2RHnDoxnnE85tde/6s4s3bm+UAJadyFU0uf4vOad
MgN23hyNjtcBY0lbw4vx9VjngQxs99HBw7MleypvU6xIpzGhHi7N/wLhFVnMrzDSPH9hn
AmIY5AigVeUjCGK0SQ5zph0bWIqcek0te8vO13hG37rvAAD+s+qUMwLEOaHTCk=
-
-- nodeset:
- name: kolla-centos-9-stream
- nodes:
- - name: primary
- label: centos-9-stream
-
-- nodeset:
- name: kolla-centos-10-stream
- nodes:
- - name: primary
- label: centos-10-stream-8GB
-
-- nodeset:
- name: kolla-centos-10-stream-aarch64
- nodes:
- - name: primary
- label: centos-10-stream-arm64-8GB
-
-- nodeset:
- name: kolla-rockylinux-9
- nodes:
- - name: primary
- label: rockylinux-9
-
-- nodeset:
- name: kolla-ubuntu-noble
- nodes:
- - name: primary
- label: ubuntu-noble
-
-- nodeset:
- name: kolla-debian-bookworm
- nodes:
- - name: primary
- label: debian-bookworm
-
-- nodeset:
- name: kolla-debian-bookworm-aarch64
- nodes:
- - name: primary
- label: debian-bookworm-arm64
-
-- nodeset:
- name: kolla-ubuntu-noble-aarch64
- nodes:
- - name: primary
- label: ubuntu-noble-arm64
-
-- 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
diff --git a/zuul.d/tox.yaml b/zuul.d/tox.yaml
new file mode 100644
index 000000000..a818ff411
--- /dev/null
+++ b/zuul.d/tox.yaml
@@ -0,0 +1,23 @@
+---
+- job:
+ name: kolla-tox-genconfig
+ parent: openstack-tox
+ timeout: 2400
+ description: |
+
+ Run genconfig
+
+ Uses tox with the ``genconfig`` environment.
+ vars:
+ tox_envlist: genconfig
+
+- project-template:
+ name: kolla-tox-genconfig
+ description: |
+ Runs tox with ``genconfig`` environment.
+ check:
+ jobs:
+ - kolla-tox-genconfig
+ gate:
+ jobs:
+ - kolla-tox-genconfig
diff --git a/zuul.d/ubuntu.yaml b/zuul.d/ubuntu.yaml
new file mode 100644
index 000000000..d10bfd8d0
--- /dev/null
+++ b/zuul.d/ubuntu.yaml
@@ -0,0 +1,65 @@
+---
+- job:
+ name: kolla-build-ubuntu-noble
+ parent: kolla-base
+ nodeset: kolla-ubuntu-noble-8GB
+ vars:
+ base_distro: ubuntu
+ base_distro_version: noble
+
+- job:
+ name: kolla-build-ubuntu-noble-podman
+ parent: kolla-base-podman
+ nodeset: kolla-ubuntu-noble-8GB
+ vars:
+ base_distro: ubuntu
+ base_distro_version: noble
+
+- job:
+ name: kolla-build-ubuntu-noble-aarch64
+ parent: kolla-build-ubuntu-noble
+ nodeset: kolla-ubuntu-noble-aarch64-8GB
+ vars:
+ base_arch: aarch64
+ voting: false
+
+- job:
+ name: kolla-publish-ubuntu-noble-quay
+ parent: kolla-build-ubuntu-noble
+ post-run: tests/playbooks/publish.yml
+ vars:
+ publisher: true
+ kolla_registry: quay.io
+ kolla_namespace: openstack.kolla
+ secrets:
+ - kolla_quay_io_creds
+ - kolla_quay_io_api
+
+- job:
+ name: kolla-build-no-infra-wheels-ubuntu-noble
+ parent: kolla-build-no-infra-wheels-base
+ nodeset: kolla-ubuntu-noble-8GB
+ vars:
+ base_distro: ubuntu
+
+- project-template:
+ name: kolla-build-ubuntu
+ description: |
+ Runs Kolla Ubuntu build jobs.
+ check:
+ jobs:
+ - kolla-build-ubuntu-noble
+ - kolla-build-ubuntu-noble-podman
+ check-arm64:
+ jobs:
+ - kolla-build-ubuntu-noble-aarch64
+ gate:
+ jobs:
+ - kolla-build-ubuntu-noble
+ - kolla-build-ubuntu-noble-podman
+ experimental:
+ jobs:
+ - kolla-build-no-infra-wheels-ubuntu-noble
+ periodic:
+ jobs:
+ - kolla-publish-ubuntu-noble-quay