aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/templates/template_overrides.j28
-rw-r--r--zuul.d/scenarios/aio.yaml46
-rw-r--r--zuul.d/scenarios/bifrost.yaml10
-rw-r--r--zuul.d/scenarios/cells.yaml10
-rw-r--r--zuul.d/scenarios/cephadm.yaml19
-rw-r--r--zuul.d/scenarios/ironic.yaml10
-rw-r--r--zuul.d/scenarios/mariadb.yaml10
-rw-r--r--zuul.d/scenarios/masakari.yaml10
-rw-r--r--zuul.d/scenarios/octavia.yaml7
-rw-r--r--zuul.d/scenarios/ovn.yaml10
-rw-r--r--zuul.d/scenarios/telemetry.yaml10
11 files changed, 54 insertions, 96 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index cf34eb37f..3baa8d704 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -10,10 +10,6 @@ ENV PIP_TRUSTED_HOST {{ nodepool_mirror_host }}
ENV PIP_EXTRA_INDEX_URL {{ nodepool_wheel_mirror }}
{% endif %}
-RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \
- && mkdir -p /usr/etc \
- && ln -s /etc/npmrc /usr/etc/npmrc
-
{% raw %}
{% endblock %}
{% endraw %}
@@ -29,10 +25,6 @@ ENV PIP_TRUSTED_HOST=
{% if use_infra_wheels_mirror | default(true) %}
ENV PIP_EXTRA_INDEX_URL=
{% endif %}
-RUN if [ -f /usr/etc/npmrc ]; then \
- unlink /usr/etc/npmrc; \
- fi \
- && rm -f /etc/npmrc
{% raw %}
{% endblock %}
diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml
index f7ed01d31..4a8a324ea 100644
--- a/zuul.d/scenarios/aio.yaml
+++ b/zuul.d/scenarios/aio.yaml
@@ -5,37 +5,23 @@
Runs Kolla-Ansible AIO jobs on all Kolla changes.
check:
jobs:
- - kolla-ansible-centos-10s:
- files: ^docker/
- - kolla-ansible-debian-trixie:
- files: ^docker/
- - kolla-ansible-debian-trixie-upgrade:
- files: ^docker/
- - kolla-ansible-rocky-10:
- files: ^docker/
- - kolla-ansible-rocky-10-upgrade:
- files: ^docker/
- - kolla-ansible-ubuntu-noble:
- files: ^docker/
- - kolla-ansible-ubuntu-noble-upgrade:
- files: ^docker/
+ - kolla-ansible-centos-10s: &files
+ files: ^kolla/docker/
+ - kolla-ansible-debian-trixie: *files
+ - kolla-ansible-debian-trixie-upgrade: *files
+ - kolla-ansible-rocky-10: *files
+ - kolla-ansible-rocky-10-upgrade: *files
+ - kolla-ansible-ubuntu-noble: *files
+ - kolla-ansible-ubuntu-noble-upgrade: *files
check-arm64:
jobs:
- - kolla-ansible-centos-10s-aarch64:
- files: ^docker/
- - kolla-ansible-debian-trixie-aarch64:
- files: ^docker/
+ - kolla-ansible-centos-10s-aarch64: *files
+ - kolla-ansible-debian-trixie-aarch64: *files
gate:
jobs:
- - kolla-ansible-debian-trixie:
- files: ^docker/
- - kolla-ansible-debian-trixie-upgrade:
- files: ^docker/
- - kolla-ansible-rocky-10:
- files: ^docker/
- - kolla-ansible-rocky-10-upgrade:
- files: ^docker/
- - kolla-ansible-ubuntu-noble:
- files: ^docker/
- - kolla-ansible-ubuntu-noble-upgrade:
- files: ^docker/
+ - kolla-ansible-debian-trixie: *files
+ - kolla-ansible-debian-trixie-upgrade: *files
+ - kolla-ansible-rocky-10: *files
+ - kolla-ansible-rocky-10-upgrade: *files
+ - kolla-ansible-ubuntu-noble: *files
+ - kolla-ansible-ubuntu-noble-upgrade: *files
diff --git a/zuul.d/scenarios/bifrost.yaml b/zuul.d/scenarios/bifrost.yaml
index 9a507ec17..a8eeb4154 100644
--- a/zuul.d/scenarios/bifrost.yaml
+++ b/zuul.d/scenarios/bifrost.yaml
@@ -5,9 +5,7 @@
Runs Kolla-Ansible Bifrost scenario jobs on particular Kolla changes.
check:
jobs:
- - kolla-ansible-debian-trixie-bifrost:
- files: ^docker/bifrost/
- - kolla-ansible-rocky-10-bifrost:
- files: ^docker/bifrost/
- - kolla-ansible-ubuntu-noble-bifrost:
- files: ^docker/bifrost/
+ - kolla-ansible-debian-trixie-bifrost: &files
+ files: ^kolla/docker/bifrost/
+ - kolla-ansible-rocky-10-bifrost: *files
+ - kolla-ansible-ubuntu-noble-bifrost: *files
diff --git a/zuul.d/scenarios/cells.yaml b/zuul.d/scenarios/cells.yaml
index 541d6777f..ed0ad5f7a 100644
--- a/zuul.d/scenarios/cells.yaml
+++ b/zuul.d/scenarios/cells.yaml
@@ -5,9 +5,7 @@
Runs Kolla-Ansible Nova Cells scenario jobs on particular Kolla changes.
check:
jobs:
- - kolla-ansible-debian-trixie-cells:
- files: ^docker/proxysql/
- - kolla-ansible-rocky-10-cells:
- files: ^docker/proxysql/
- - kolla-ansible-ubuntu-noble-cells:
- files: ^docker/proxysql/
+ - kolla-ansible-debian-trixie-cells: &files
+ files: ^docker/docker/proxysql/
+ - kolla-ansible-rocky-10-cells: *files
+ - kolla-ansible-ubuntu-noble-cells: *files
diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml
index 66f173ff5..06f48209b 100644
--- a/zuul.d/scenarios/cephadm.yaml
+++ b/zuul.d/scenarios/cephadm.yaml
@@ -5,15 +5,10 @@
Runs Kolla-Ansible CephAdm scenario jobs on particular Kolla changes.
check:
jobs:
- - kolla-ansible-debian-trixie-cephadm:
- files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
- - kolla-ansible-debian-bookworm-cephadm-upgrade:
- files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
- - kolla-ansible-rocky-10-cephadm:
- files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
- - kolla-ansible-rocky-10-cephadm-upgrade:
- files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
- - kolla-ansible-ubuntu-noble-cephadm:
- files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
- - kolla-ansible-ubuntu-noble-cephadm-upgrade:
- files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
+ - kolla-ansible-debian-trixie-cephadm: &files
+ files: ^kolla/docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
+ - kolla-ansible-debian-bookworm-cephadm-upgrade: *files
+ - kolla-ansible-rocky-10-cephadm: *files
+ - kolla-ansible-rocky-10-cephadm-upgrade: *files
+ - kolla-ansible-ubuntu-noble-cephadm: *files
+ - kolla-ansible-ubuntu-noble-cephadm-upgrade: *files
diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml
index f6528ef98..72a9bf66e 100644
--- a/zuul.d/scenarios/ironic.yaml
+++ b/zuul.d/scenarios/ironic.yaml
@@ -5,9 +5,7 @@
Runs Kolla-Ansible Ironic scenario jobs on particular Kolla changes.
check:
jobs:
- - kolla-ansible-debian-trixie-ironic:
- files: ^docker\/(base|dnsmasq|ironic|iscsid|openstack-base)\/.*
- - kolla-ansible-rocky-10-ironic:
- files: ^docker\/(base|dnsmasq|ironic|iscsid|openstack-base)\/.*
- - kolla-ansible-ubuntu-noble-ironic:
- files: ^docker\/(base|dnsmasq|ironic|iscsid|openstack-base)\/.*
+ - kolla-ansible-debian-trixie-ironic: &files
+ files: ^kolla/docker\/(base|dnsmasq|ironic|iscsid|openstack-base)\/.*
+ - kolla-ansible-rocky-10-ironic: *files
+ - kolla-ansible-ubuntu-noble-ironic: *files
diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml
index 5905a1057..882e1338e 100644
--- a/zuul.d/scenarios/mariadb.yaml
+++ b/zuul.d/scenarios/mariadb.yaml
@@ -5,9 +5,7 @@
Runs Kolla-Ansible MariaDB scenario jobs on particular Kolla changes.
check:
jobs:
- - kolla-ansible-debian-trixie-mariadb:
- files: ^docker/(base|mariadb-server)/
- - kolla-ansible-rocky-10-mariadb:
- files: ^docker/(base|mariadb-server)/
- - kolla-ansible-ubuntu-noble-mariadb:
- files: ^docker/(base|mariadb-server)/
+ - kolla-ansible-debian-trixie-mariadb: &files
+ files: ^kolla/docker/(base|mariadb-server)/
+ - kolla-ansible-rocky-10-mariadb: *files
+ - kolla-ansible-ubuntu-noble-mariadb: *files
diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml
index dc7744853..1a6d355e9 100644
--- a/zuul.d/scenarios/masakari.yaml
+++ b/zuul.d/scenarios/masakari.yaml
@@ -5,9 +5,7 @@
Runs Kolla-Ansible Masakari scenario jobs on particular Kolla changes.
check:
jobs:
- - kolla-ansible-debian-trixie-masakari:
- files: ^docker/(base|masakari|openstack-base)/
- - kolla-ansible-rocky-10-masakari:
- files: ^docker/(base|masakari|openstack-base)/
- - kolla-ansible-ubuntu-noble-masakari:
- files: ^docker/(base|masakari|openstack-base)/
+ - kolla-ansible-debian-trixie-masakari: &files
+ files: ^kolla/docker/(base|masakari|openstack-base)/
+ - kolla-ansible-rocky-10-masakari: *files
+ - kolla-ansible-ubuntu-noble-masakari: *files
diff --git a/zuul.d/scenarios/octavia.yaml b/zuul.d/scenarios/octavia.yaml
index ddfb1e0e8..c899cc93f 100644
--- a/zuul.d/scenarios/octavia.yaml
+++ b/zuul.d/scenarios/octavia.yaml
@@ -5,7 +5,6 @@
Runs Kolla-Ansible Octavia scenario jobs on particular Kolla changes.
check:
jobs:
- - kolla-ansible-debian-trixie-octavia:
- files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
- - kolla-ansible-ubuntu-noble-octavia:
- files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
+ - kolla-ansible-debian-trixie-octavia: &files
+ files: ^kolla/docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
+ - kolla-ansible-ubuntu-noble-octavia: *files
diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml
index 1bd5e7e1e..dee5480c5 100644
--- a/zuul.d/scenarios/ovn.yaml
+++ b/zuul.d/scenarios/ovn.yaml
@@ -5,9 +5,7 @@
Runs Kolla-Ansible OVN scenario jobs on particular Kolla changes.
check:
jobs:
- - kolla-ansible-debian-trixie-ovn:
- files: ^docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/
- - kolla-ansible-rocky-10-ovn:
- files: ^docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/
- - kolla-ansible-ubuntu-noble-ovn:
- files: ^docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/
+ - kolla-ansible-debian-trixie-ovn: &files
+ files: ^kolla/docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/
+ - kolla-ansible-rocky-10-ovn: *files
+ - kolla-ansible-ubuntu-noble-ovn: *files
diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml
index ef90c34af..04ab2b0f8 100644
--- a/zuul.d/scenarios/telemetry.yaml
+++ b/zuul.d/scenarios/telemetry.yaml
@@ -5,9 +5,7 @@
Runs Kolla-Ansible Telemetry scenario jobs on particular Kolla changes.
check:
jobs:
- - kolla-ansible-debian-trixie-telemetry:
- files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.*
- - kolla-ansible-rocky-10-telemetry:
- files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.*
- - kolla-ansible-ubuntu-noble-telemetry:
- files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.*
+ - kolla-ansible-debian-trixie-telemetry: &files
+ files: ^kolla/docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.*
+ - kolla-ansible-rocky-10-telemetry: *files
+ - kolla-ansible-ubuntu-noble-telemetry: *files
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 15:51:52 +0000