Skip to content

Commit d7b6885

Browse files
authored
Merge pull request #411 from stackhpc/upstream/2024.1-2025-05-19
Synchronise 2024.1 with upstream
2 parents 1b8bf53 + 8f50223 commit d7b6885

File tree

3 files changed

+0
-10
lines changed

3 files changed

+0
-10
lines changed

.zuul.d/debian.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
- kolla-build-debian
66
- kolla-build-debian-podman
77
- kolla-ansible-debian
8-
- kolla-ansible-debian-upgrade
98
check-arm64:
109
jobs:
1110
- kolla-build-debian-aarch64
@@ -15,7 +14,6 @@
1514
- kolla-build-debian
1615
- kolla-build-debian-podman
1716
- kolla-ansible-debian
18-
- kolla-ansible-debian-upgrade
1917
periodic:
2018
jobs:
2119
- kolla-publish-debian-quay

.zuul.d/rocky.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
- kolla-build-rocky9
66
- kolla-build-rocky9-podman
77
- kolla-ansible-rocky9
8-
- kolla-ansible-rocky9-upgrade
98
# Test rabbitmq and mariadb in multinode ceph jobs.
109
- kolla-ansible-rocky9-cephadm:
1110
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
12-
- kolla-ansible-rocky9-upgrade-cephadm:
13-
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
1411
- kolla-ansible-rocky9-ironic:
1512
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
1613
- kolla-ansible-rocky9-swift:
@@ -36,7 +33,6 @@
3633
- kolla-build-rocky9
3734
- kolla-build-rocky9-podman
3835
- kolla-ansible-rocky9
39-
- kolla-ansible-rocky9-upgrade
4036
periodic:
4137
jobs:
4238
- kolla-publish-rocky9-quay

.zuul.d/ubuntu.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@
77
- kolla-build-ubuntu-jammy-podman
88
- kolla-build-ubuntu-noble-podman
99
- kolla-ansible-ubuntu
10-
- kolla-ansible-ubuntu-upgrade
1110
# Test rabbitmq and mariadb in multinode ceph jobs.
1211
- kolla-ansible-ubuntu-cephadm:
1312
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
14-
- kolla-ansible-ubuntu-upgrade-cephadm:
15-
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
1613
- kolla-ansible-ubuntu-ironic:
1714
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
1815
- kolla-ansible-ubuntu-swift:
@@ -40,7 +37,6 @@
4037
- kolla-build-ubuntu-jammy-podman
4138
- kolla-build-ubuntu-noble-podman
4239
- kolla-ansible-ubuntu
43-
- kolla-ansible-ubuntu-upgrade
4440
periodic:
4541
jobs:
4642
- kolla-publish-ubuntu-jammy-quay

0 commit comments

Comments
 (0)