openstack/kolla-ansible
Code Issues Proposed changes

CI: Refactor base jobs

Browse Source 
Since Zuul was restarted after applying [1], we can keep relevant
files listings in the base jobs per scenario without blocking
periodic job runs.
This greatly simplifies the jobs and project definitions.

[1] https://review.opendev.org/678273

Change-Id: If2e4fff6a514e6174709c2fc9f76b103f81a54ae
This commit is contained in:
Radosław Piliszek 2020-01-18 13:01:25 +01:00
parent b103989642
commit beed12f354
3 changed files with 97 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
zuul.d/base.yaml
View File

@ -23,6 +23,7 @@
- ^specs/ - ^specs/
- ^kolla_ansible/tests/ - ^kolla_ansible/tests/
vars: vars:
previous_release: train
scenario: core scenario: core
is_upgrade: no is_upgrade: no
api_network_prefix: "192.0.2." api_network_prefix: "192.0.2."
@ -34,11 +35,18 @@
- zuul: zuul/zuul-jobs - zuul: zuul/zuul-jobs
- job: - job:
name: kolla-ansible-upgrade-base name: kolla-ansible-ceph-base
parent: kolla-ansible-base parent: kolla-ansible-base
voting: false
vars: vars:
previous_release: train scenario: ceph
is_upgrade: yes host-vars:
primary:
ceph_osd_storetype: filestore
secondary1:
ceph_osd_storetype: bluestore
secondary2:
ceph_osd_storetype: bluestore
- job: - job:
name: kolla-ansible-ipv6-base name: kolla-ansible-ipv6-base
@ -53,6 +61,10 @@
- job: - job:
name: kolla-ansible-bifrost-base name: kolla-ansible-bifrost-base
parent: kolla-ansible-base parent: kolla-ansible-base
voting: false
files:
- ^ansible/roles/bifrost/
- ^tests/test-bifrost.sh
vars: vars:
scenario: bifrost scenario: bifrost
install_type: source install_type: source
@ -98,9 +110,63 @@
name: kolla-ansible-ceph-ansible-base name: kolla-ansible-ceph-ansible-base
parent: kolla-ansible-base parent: kolla-ansible-base
voting: false voting: false
files:
- ^ansible/roles/(cinder|glance|gnocchi|nova-cell)/
- ^tests/deploy-ceph-ansible.sh
vars: vars:
scenario: ceph-ansible scenario: ceph-ansible
ceph_osd_storetype: ceph-lvm ceph_osd_storetype: ceph-lvm
required-projects: required-projects:
- name: github.com/ceph/ceph-ansible - name: github.com/ceph/ceph-ansible
override-checkout: v4.0.7 override-checkout: v4.0.7
- job:
name: kolla-ansible-cinder-lvm-base
parent: kolla-ansible-base
voting: false
files:
- ^ansible/roles/(cinder|iscsi)/
- ^tests/setup_disks.sh
- ^tests/test-core-openstack.sh
- ^tests/test-dashboard.sh
vars:
scenario: cinder-lvm
- job:
name: kolla-ansible-masakari-base
parent: kolla-ansible-base
voting: false
files:
- ^ansible/roles/masakari/
- ^tests/test-masakari.sh
- ^tests/test-dashboard.sh
vars:
scenario: masakari
- job:
name: kolla-ansible-mariadb-base
parent: kolla-ansible-base
voting: false
files:
- ^ansible/roles/mariadb/
- ^tests/test-mariadb.sh
vars:
scenario: mariadb
- job:
name: kolla-ansible-scenario-nfv-base
parent: kolla-ansible-base
voting: false
files:
- ^ansible/roles/(barbican|heat|mistral|redis|tacker)/
- ^tests/test-scenario-nfv.sh
- ^tests/test-dashboard.sh
vars:
scenario: scenario_nfv
- job:
name: kolla-ansible-cells-base
parent: kolla-ansible-base
voting: false
vars:
scenario: cells

86
zuul.d/jobs.yaml
View File

@ -61,39 +61,21 @@
- job: - job:
name: kolla-ansible-ubuntu-source-ceph name: kolla-ansible-ubuntu-source-ceph
parent: kolla-ansible-base parent: kolla-ansible-ceph-base
nodeset: kolla-ansible-bionic-multi nodeset: kolla-ansible-bionic-multi
timeout: 9000 timeout: 9000
voting: false
vars: vars:
base_distro: ubuntu base_distro: ubuntu
install_type: source install_type: source
scenario: ceph
host-vars:
primary:
ceph_osd_storetype: filestore
secondary1:
ceph_osd_storetype: bluestore
secondary2:
ceph_osd_storetype: bluestore
- job: - job:
name: kolla-ansible-centos-source-ceph name: kolla-ansible-centos-source-ceph
parent: kolla-ansible-base parent: kolla-ansible-ceph-base
nodeset: kolla-ansible-centos-multi nodeset: kolla-ansible-centos-multi
timeout: 9000 timeout: 9000
voting: false
vars: vars:
base_distro: centos base_distro: centos
install_type: source install_type: source
scenario: ceph
host-vars:
primary:
ceph_osd_storetype: filestore
secondary1:
ceph_osd_storetype: bluestore
secondary2:
ceph_osd_storetype: bluestore
- job: - job:
name: kolla-ansible-centos-source-ceph-ansible name: kolla-ansible-centos-source-ceph-ansible
@ -115,103 +97,80 @@
- job: - job:
name: kolla-ansible-ubuntu-source-cinder-lvm name: kolla-ansible-ubuntu-source-cinder-lvm
parent: kolla-ansible-base parent: kolla-ansible-cinder-lvm-base
nodeset: kolla-ansible-bionic-multi nodeset: kolla-ansible-bionic-multi
voting: false
vars: vars:
base_distro: ubuntu base_distro: ubuntu
install_type: source install_type: source
scenario: cinder-lvm
- job: - job:
name: kolla-ansible-centos-source-cinder-lvm name: kolla-ansible-centos-source-cinder-lvm
parent: kolla-ansible-base parent: kolla-ansible-cinder-lvm-base
nodeset: kolla-ansible-centos-multi nodeset: kolla-ansible-centos-multi
voting: false
vars: vars:
base_distro: centos base_distro: centos
install_type: source install_type: source
scenario: cinder-lvm
- job: - job:
name: kolla-ansible-centos-source-mariadb name: kolla-ansible-centos-source-mariadb
parent: kolla-ansible-base parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-centos-multi nodeset: kolla-ansible-centos-multi
voting: false
vars: vars:
base_distro: centos base_distro: centos
install_type: source install_type: source
scenario: mariadb
- job: - job:
name: kolla-ansible-ubuntu-source-mariadb name: kolla-ansible-ubuntu-source-mariadb
parent: kolla-ansible-base parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-bionic-multi nodeset: kolla-ansible-bionic-multi
voting: false
vars: vars:
base_distro: ubuntu base_distro: ubuntu
install_type: source install_type: source
scenario: mariadb
- job: - job:
name: kolla-ansible-centos-source-upgrade name: kolla-ansible-centos-source-upgrade
parent: kolla-ansible-upgrade-base parent: kolla-ansible-base
nodeset: kolla-ansible-centos nodeset: kolla-ansible-centos
timeout: 9000 timeout: 9000
vars: vars:
base_distro: centos base_distro: centos
install_type: source install_type: source
is_upgrade: yes
- job: - job:
name: kolla-ansible-ubuntu-source-upgrade name: kolla-ansible-ubuntu-source-upgrade
parent: kolla-ansible-upgrade-base parent: kolla-ansible-base
nodeset: kolla-ansible-bionic nodeset: kolla-ansible-bionic
timeout: 9000 timeout: 9000
vars: vars:
base_distro: ubuntu base_distro: ubuntu
install_type: source install_type: source
is_upgrade: yes
- job: - job:
name: kolla-ansible-ubuntu-source-upgrade-ceph name: kolla-ansible-ubuntu-source-upgrade-ceph
parent: kolla-ansible-upgrade-base parent: kolla-ansible-ceph-base
nodeset: kolla-ansible-bionic-multi nodeset: kolla-ansible-bionic-multi
timeout: 9000 timeout: 9000
voting: false
vars: vars:
base_distro: ubuntu base_distro: ubuntu
install_type: source install_type: source
scenario: ceph is_upgrade: yes
host-vars:
primary:
ceph_osd_storetype: filestore
secondary1:
ceph_osd_storetype: bluestore
secondary2:
ceph_osd_storetype: bluestore
- job: - job:
name: kolla-ansible-centos-source-upgrade-ceph name: kolla-ansible-centos-source-upgrade-ceph
parent: kolla-ansible-upgrade-base parent: kolla-ansible-ceph-base
nodeset: kolla-ansible-centos-multi nodeset: kolla-ansible-centos-multi
timeout: 9000 timeout: 9000
voting: false
vars: vars:
base_distro: centos base_distro: centos
install_type: source install_type: source
scenario: ceph is_upgrade: yes
host-vars:
primary:
ceph_osd_storetype: filestore
secondary1:
ceph_osd_storetype: bluestore
secondary2:
ceph_osd_storetype: bluestore
- job: - job:
name: kolla-ansible-bifrost-centos-source name: kolla-ansible-bifrost-centos-source
parent: kolla-ansible-bifrost-base parent: kolla-ansible-bifrost-base
nodeset: kolla-ansible-centos nodeset: kolla-ansible-centos
voting: false
vars: vars:
base_distro: centos base_distro: centos
@ -249,14 +208,11 @@
- job: - job:
name: kolla-ansible-centos-source-scenario-nfv name: kolla-ansible-centos-source-scenario-nfv
parent: kolla-ansible-base parent: kolla-ansible-scenario-nfv-base
nodeset: kolla-ansible-centos-multi nodeset: kolla-ansible-centos-multi
description: CI scenario to test NFV orchestration
voting: false
vars: vars:
base_distro: centos base_distro: centos
install_type: source install_type: source
scenario: scenario_nfv
- job: - job:
name: kolla-ansible-centos-source-ironic name: kolla-ansible-centos-source-ironic
@ -294,30 +250,24 @@
- job: - job:
name: kolla-ansible-ubuntu-source-masakari name: kolla-ansible-ubuntu-source-masakari
parent: kolla-ansible-base parent: kolla-ansible-masakari-base
nodeset: kolla-ansible-bionic nodeset: kolla-ansible-bionic
voting: false
vars: vars:
base_distro: ubuntu base_distro: ubuntu
install_type: source install_type: source
scenario: masakari
- job: - job:
name: kolla-ansible-centos-source-masakari name: kolla-ansible-centos-source-masakari
parent: kolla-ansible-base parent: kolla-ansible-masakari-base
nodeset: kolla-ansible-centos nodeset: kolla-ansible-centos
voting: false
vars: vars:
base_distro: centos base_distro: centos
install_type: source install_type: source
scenario: masakari
- job: - job:
name: kolla-ansible-centos-source-cells name: kolla-ansible-centos-source-cells
parent: kolla-ansible-base parent: kolla-ansible-cells-base
nodeset: kolla-ansible-centos-multi nodeset: kolla-ansible-centos-multi
voting: false
vars: vars:
base_distro: centos base_distro: centos
install_type: source install_type: source
scenario: cells

57
zuul.d/project.yaml
View File

@ -17,41 +17,16 @@
- kolla-ansible-ubuntu-source-multinode-ipv6 - kolla-ansible-ubuntu-source-multinode-ipv6
- kolla-ansible-ubuntu-source-ceph - kolla-ansible-ubuntu-source-ceph
- kolla-ansible-centos-source-ceph - kolla-ansible-centos-source-ceph
- kolla-ansible-ubuntu-source-cinder-lvm: - kolla-ansible-ubuntu-source-cinder-lvm
files: - kolla-ansible-centos-source-cinder-lvm
- ^ansible/roles/(cinder|iscsi)/ - kolla-ansible-bifrost-centos-source
- ^tests/setup_disks.sh
- ^tests/test-core-openstack.sh
- ^tests/test-dashboard.sh
- kolla-ansible-centos-source-cinder-lvm:
files:
- ^ansible/roles/(cinder|iscsi)/
- ^tests/setup_disks.sh
- ^tests/test-core-openstack.sh
- ^tests/test-dashboard.sh
- kolla-ansible-bifrost-centos-source:
files:
- ^ansible/roles/bifrost/
- ^tests/test-bifrost.sh
- kolla-ansible-centos-source-zun - kolla-ansible-centos-source-zun
- kolla-ansible-ubuntu-source-zun - kolla-ansible-ubuntu-source-zun
- kolla-ansible-centos-source-swift - kolla-ansible-centos-source-swift
- kolla-ansible-ubuntu-source-swift - kolla-ansible-ubuntu-source-swift
- kolla-ansible-centos-source-scenario-nfv: - kolla-ansible-centos-source-scenario-nfv
files: - kolla-ansible-ubuntu-source-masakari
- ^ansible/roles/(barbican|heat|mistral|redis|tacker)/ - kolla-ansible-centos-source-masakari
- ^tests/test-scenario-nfv.sh
- ^tests/test-dashboard.sh
- kolla-ansible-ubuntu-source-masakari:
files:
- ^ansible/roles/masakari/
- ^tests/test-masakari.sh
- ^tests/test-dashboard.sh
- kolla-ansible-centos-source-masakari:
files:
- ^ansible/roles/masakari/
- ^tests/test-masakari.sh
- ^tests/test-dashboard.sh
- kolla-ansible-centos-source-ironic - kolla-ansible-centos-source-ironic
- kolla-ansible-centos-binary-ironic - kolla-ansible-centos-binary-ironic
- kolla-ansible-ubuntu-source-ironic - kolla-ansible-ubuntu-source-ironic
@ -62,22 +37,10 @@
- kolla-ansible-centos-binary - kolla-ansible-centos-binary
- kolla-ansible-ubuntu-binary - kolla-ansible-ubuntu-binary
- kolla-ansible-centos-source-cells - kolla-ansible-centos-source-cells
- kolla-ansible-centos-source-mariadb: - kolla-ansible-centos-source-mariadb
files: - kolla-ansible-ubuntu-source-mariadb
- ^ansible/roles/mariadb/ - kolla-ansible-centos-source-ceph-ansible
- ^tests/test-mariadb.sh - kolla-ansible-ubuntu-source-ceph-ansible
- kolla-ansible-ubuntu-source-mariadb:
files:
- ^ansible/roles/mariadb/
- ^tests/test-mariadb.sh
- kolla-ansible-centos-source-ceph-ansible:
files:
- ^ansible/roles/(cinder|glance|gnocchi|nova-cell)/
- ^tests/deploy-ceph-ansible.sh
- kolla-ansible-ubuntu-source-ceph-ansible:
files:
- ^ansible/roles/(cinder|glance|gnocchi|nova-cell)/
- ^tests/deploy-ceph-ansible.sh
check-arm64: check-arm64:
jobs: jobs:
- kolla-ansible-debian-source-aarch64 - kolla-ansible-debian-source-aarch64