From cf3f901c528f2c002cf0899e930d3018ab1b79b1 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Sun, 7 Feb 2021 10:30:40 +0200 Subject: [PATCH] Do not prepare upstream repos for distro jobs Since we don't build from source, we don't need to clone and prepare upstream services' repos for distro jobs. Change-Id: Ie58167c4bc940eb5b5d2887421212eb2ce97fb8d --- zuul.d/jobs.yaml | 126 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 98 insertions(+), 28 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index cb5f2b5ea9..0c597539ba 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -14,12 +14,99 @@ # limitations under the License. - job: - name: openstack-ansible-deploy-aio + name: openstack-ansible-deploy parent: base description: | - Run functional tests for an OpenStack-Ansible project. - Uses the gate-check-commit.sh script, running a default - aio deploy. + Global parent for integrated OpenStack-Ansible tests + pre-run: + - zuul.d/playbooks/pre-gate-cleanup.yml + - zuul.d/playbooks/pre-gate-scenario.yml + - zuul.d/playbooks/pre-osa-aio.yml + run: zuul.d/playbooks/run.yml + post-run: + - zuul.d/playbooks/post.yml + timeout: 10800 + irrelevant-files: + - ^\.git.* + - ^.*\.(example|md|rst)$ + - ^deploy-guide/.* + - ^doc/.* + - ^releasenotes/.* + - ^setup\.(cfg|py)$ + - ^tox.ini$ + - ^Vagrantfile + +- job: + name: openstack-ansible-deploy-aio-distro + parent: openstack-ansible-deploy + description: | + Run integrated tests for an OpenStack-Ansible project. + This should be used only for distro based tests. + required-projects: + # OSA repos + - name: openstack/openstack-ansible + - name: openstack/ansible-hardening + - name: openstack/openstack-ansible-apt_package_pinning + - name: openstack/ansible-config_template + - name: openstack/openstack-ansible-galera_client + - name: openstack/openstack-ansible-galera_server + - name: openstack/openstack-ansible-ceph_client + - name: openstack/openstack-ansible-haproxy_server + - name: openstack/openstack-ansible-lxc_container_create + - name: openstack/openstack-ansible-lxc_hosts + - name: openstack/openstack-ansible-memcached_server + - name: openstack/openstack-ansible-openstack_hosts + - name: openstack/openstack-ansible-os_keystone + - name: openstack/openstack-ansible-openstack_openrc + - name: openstack/openstack-ansible-os_adjutant + - name: openstack/openstack-ansible-os_aodh + - name: openstack/openstack-ansible-os_barbican + - name: openstack/openstack-ansible-os_blazar + - name: openstack/openstack-ansible-os_ceilometer + - name: openstack/openstack-ansible-os_cinder + - name: openstack/openstack-ansible-os_designate + - name: openstack/openstack-ansible-os_glance + - name: openstack/openstack-ansible-os_gnocchi + - name: openstack/openstack-ansible-os_heat + - name: openstack/openstack-ansible-os_horizon + - name: openstack/openstack-ansible-os_ironic + - name: openstack/openstack-ansible-os_magnum + - name: openstack/openstack-ansible-os_manila + - name: openstack/openstack-ansible-os_masakari + - name: openstack/openstack-ansible-os_mistral + - name: openstack/openstack-ansible-os_murano + - name: openstack/openstack-ansible-os_neutron + - name: openstack/openstack-ansible-os_nova + - name: openstack/openstack-ansible-os_octavia + - name: openstack/openstack-ansible-os_panko + - name: openstack/openstack-ansible-os_placement + - name: openstack/openstack-ansible-os_rally + - name: openstack/openstack-ansible-os_sahara + - name: openstack/openstack-ansible-os_senlin + - name: openstack/openstack-ansible-os_swift + - name: openstack/openstack-ansible-os_tacker + - name: openstack/openstack-ansible-os_tempest + - name: openstack/openstack-ansible-os_trove + - name: openstack/openstack-ansible-plugins + - name: openstack/ansible-role-qdrouterd + - name: openstack/openstack-ansible-rabbitmq_server + - name: openstack/openstack-ansible-repo_server + - name: openstack/openstack-ansible-rsyslog_client + - name: openstack/openstack-ansible-rsyslog_server + - name: openstack/openstack-ansible-nspawn_container_create + - name: openstack/openstack-ansible-nspawn_hosts + - name: openstack/ansible-role-systemd_service + - name: openstack/ansible-role-systemd_mount + - name: openstack/ansible-role-systemd_networkd + - name: openstack/ansible-role-python_venv_build + - name: openstack/ansible-role-uwsgi + +- job: + name: openstack-ansible-deploy-aio + parent: openstack-ansible-deploy + description: | + Run integrated tests for an OpenStack-Ansible project. + This should be used only for source based tests. required-projects: # OSA repos - name: openstack/openstack-ansible @@ -130,23 +217,6 @@ - name: openstack/zun - name: openstack/kuryr-libnetwork - name: openstack/kuryr - pre-run: - - zuul.d/playbooks/pre-gate-cleanup.yml - - zuul.d/playbooks/pre-gate-scenario.yml - - zuul.d/playbooks/pre-osa-aio.yml - run: zuul.d/playbooks/run.yml - post-run: - - zuul.d/playbooks/post.yml - timeout: 10800 - irrelevant-files: - - ^\.git.* - - ^.*\.(example|md|rst)$ - - ^deploy-guide/.* - - ^doc/.* - - ^releasenotes/.* - - ^setup\.(cfg|py)$ - - ^tox.ini$ - - ^Vagrantfile # Ensuring overrides work - job: @@ -210,7 +280,7 @@ - job: name: openstack-ansible-deploy-aio_distro_metal-ubuntu-focal - parent: openstack-ansible-deploy-aio + parent: openstack-ansible-deploy-aio-distro nodeset: ubuntu-focal - job: @@ -232,7 +302,7 @@ - job: name: openstack-ansible-deploy-aio_distro_lxc-ubuntu-focal - parent: openstack-ansible-deploy-aio + parent: openstack-ansible-deploy-aio-distro nodeset: ubuntu-focal - job: @@ -338,7 +408,7 @@ - job: name: openstack-ansible-deploy-aio_distro_lxc-centos-8 - parent: openstack-ansible-deploy-aio + parent: openstack-ansible-deploy-aio-distro nodeset: centos-8 - job: @@ -348,7 +418,7 @@ - job: name: openstack-ansible-deploy-aio_distro_ceph-centos-8 - parent: openstack-ansible-deploy-aio + parent: openstack-ansible-deploy-aio-distro nodeset: centos-8 - job: @@ -369,7 +439,7 @@ - job: name: openstack-ansible-deploy-aio_distro_metal-centos-8 - parent: openstack-ansible-deploy-aio + parent: openstack-ansible-deploy-aio-distro nodeset: centos-8 voting: false @@ -408,7 +478,7 @@ - job: name: openstack-ansible-deploy-aio_distro_lxc-debian-buster - parent: openstack-ansible-deploy-aio + parent: openstack-ansible-deploy-aio-distro nodeset: debian-buster - job: @@ -418,5 +488,5 @@ - job: name: openstack-ansible-deploy-aio_distro_metal-debian-buster - parent: openstack-ansible-deploy-aio + parent: openstack-ansible-deploy-aio-distro nodeset: debian-buster