Merge "CI: Remove kolla_python_version from Debian/Ubuntu jobs" into stable/wallaby

This commit is contained in:
Zuul 2021-04-29 11:48:54 +00:00 committed by Gerrit Code Review
commit a7d7401fd9
2 changed files with 7 additions and 43 deletions

View File

@ -4,15 +4,11 @@
jobs: jobs:
- kolla-build-debian-source - kolla-build-debian-source
- kolla-build-debian-binary - kolla-build-debian-binary
- kolla-ansible-debian-source: - kolla-ansible-debian-source
vars:
kolla_python_version: 3.9
check-arm64: check-arm64:
jobs: jobs:
- kolla-build-debian-source-aarch64 - kolla-build-debian-source-aarch64
- kolla-ansible-debian-source-aarch64: - kolla-ansible-debian-source-aarch64
vars:
kolla_python_version: 3.9
periodic: periodic:
jobs: jobs:
- kolla-publish-debian-source-quay - kolla-publish-debian-source-quay

View File

@ -4,25 +4,15 @@
jobs: jobs:
- kolla-build-ubuntu-binary - kolla-build-ubuntu-binary
- kolla-build-ubuntu-source - kolla-build-ubuntu-source
- kolla-ansible-ubuntu-source: - kolla-ansible-ubuntu-source
vars: - kolla-ansible-ubuntu-binary
kolla_python_version: 3.8 - kolla-ansible-ubuntu-source-upgrade
- kolla-ansible-ubuntu-binary:
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-upgrade:
vars:
kolla_python_version: 3.8
gate: gate:
queue: kolla queue: kolla
jobs: jobs:
- kolla-build-ubuntu-source - kolla-build-ubuntu-source
- kolla-ansible-ubuntu-source: - kolla-ansible-ubuntu-source
vars: - kolla-ansible-ubuntu-source-upgrade
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-upgrade:
vars:
kolla_python_version: 3.8
periodic: periodic:
jobs: jobs:
- kolla-publish-ubuntu-source-quay - kolla-publish-ubuntu-source-quay
@ -37,48 +27,26 @@
# Test rabbitmq and mariadb in multinode ceph jobs. # Test rabbitmq and mariadb in multinode ceph jobs.
- kolla-ansible-ubuntu-source-ceph-ansible: - kolla-ansible-ubuntu-source-ceph-ansible:
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-upgrade-ceph-ansible: - kolla-ansible-ubuntu-source-upgrade-ceph-ansible:
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-zun: - kolla-ansible-ubuntu-source-zun:
files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-ironic: - kolla-ansible-ubuntu-source-ironic:
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-swift: - kolla-ansible-ubuntu-source-swift:
files: ^docker/(base|openstack-base|glance|swift)/ files: ^docker/(base|openstack-base|glance|swift)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-mariadb: - kolla-ansible-ubuntu-source-mariadb:
files: ^docker/(base|mariadb)/ files: ^docker/(base|mariadb)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-masakari: - kolla-ansible-ubuntu-source-masakari:
files: ^docker/(base|masakari|openstack-base)/ files: ^docker/(base|masakari|openstack-base)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-linuxbridge: - kolla-ansible-ubuntu-source-linuxbridge:
files: ^docker/(base|neutron|openstack-base)/ files: ^docker/(base|neutron|openstack-base)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-ovn: - kolla-ansible-ubuntu-source-ovn:
files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/ files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-prometheus-efk: - kolla-ansible-ubuntu-source-prometheus-efk:
files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/ files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-kvm: - kolla-ansible-ubuntu-source-kvm:
files: ^docker/nova/ files: ^docker/nova/
vars:
kolla_python_version: 3.8
- job: - job:
name: kolla-build-ubuntu-binary name: kolla-build-ubuntu-binary