Browse Source

[c7-train] Switch c7 jobs to content provider

This change switches c7 jobs to the content provider
dependency relation so the jobs share the produced artifacts.

It also simplifies tags by using remove_tags instead.

Depends-On: https://review.opendev.org/#/c/760672

Change-Id: I91abb432cf806f52139e59b69f89ed972d9f8c7c
changes/37/759737/9
Rafael Folco 3 months ago
parent
commit
5325afc3f2
1 changed files with 39 additions and 42 deletions
  1. +39
    -42
      zuul.d/layout.yaml

+ 39
- 42
zuul.d/layout.yaml View File

@ -6,40 +6,36 @@
- openstack-python3-ussuri-jobs
check:
jobs:
- tripleo-ci-centos-8-content-provider
- openstack-tox-linters
- tripleo-ci-centos-7-content-provider: &content_provider_c7
dependencies: &deps_lint
- openstack-tox-linters
- tripleo-ci-centos-8-content-provider: &content_provider
dependencies: *deps_lint
- openstack-tox-docs: &tripleo-docs
files:
- ^doc/.*
- ^README.rst
- tripleo-ci-centos-7-containers-multinode: &containers_multinode_c7
files: &multi_files
- ^tripleo_ansible/.*
irrelevant-files: &irrelevant_scenario_files
- .*.md$
- .*.rst$
- .*.txt$
- ^tripleo_ansible/.*molecule.*
- ^tripleo_ansible/.*meta.*
- ^tripleo_ansible/roles/test_deps/.*
- tripleo-ci-centos-8-containers-multinode: &containers_multinode
vars: &multi_consumer_vars
consumer_job: true
build_container_images: false
tags:
- undercloud-setup
- undercloud-scripts
- undercloud-install
- undercloud-post-install
- tripleo-validations
- overcloud-scripts
- overcloud-prep-config
- overcloud-prep-containers
- overcloud-deploy
- overcloud-post-deploy
- overcloud-validate
dependencies: &deps
- openstack-tox-linters
remove_tags:
- build
dependencies: &deps_cprovider_c7
- tripleo-ci-centos-7-content-provider
files: &multi_files
- ^tripleo_ansible/.*
irrelevant-files: &irrelevant_scenario_files
- .*.md$
- .*.rst$
- .*.txt$
- ^tripleo_ansible/.*molecule.*
- ^tripleo_ansible/.*meta.*
- ^tripleo_ansible/roles/test_deps/.*
- tripleo-ci-centos-8-containers-multinode: &containers_multinode
vars: *multi_consumer_vars
dependencies: &deps_cprovider
- tripleo-ci-centos-8-content-provider
files: *multi_files
irrelevant-files: *irrelevant_scenario_files
@ -49,44 +45,45 @@
build_container_images: false
tags:
- standalone
dependencies: *deps
dependencies: *deps_cprovider
files:
- ^tripleo_ansible/roles/tripleo-ceph-.*/.*
- ^tripleo_ansible/roles/tripleo-hieradata/.*
- ^tripleo_ansible/roles/tripleo-upgrade-hiera/.*
- ^setup.*
- ^tripleo_ansible/roles/tripleo-ceph-.*/.*
- ^tripleo_ansible/roles/tripleo-hieradata/.*
- ^tripleo_ansible/roles/tripleo-upgrade-hiera/.*
- ^setup.*
irrelevant-files: *irrelevant_scenario_files
- tripleo-ci-centos-8-scenario002-standalone: &scenario002
vars: *sa_consumer_vars
dependencies: *deps
dependencies: *deps_cprovider
files:
- ^tripleo_ansible/roles/tripleo-hieradata/.*
- ^tripleo_ansible/roles/tripleo-upgrade-hiera/.*
- ^tripleo_ansible/roles/tripleo-hieradata/.*
- ^tripleo_ansible/roles/tripleo-upgrade-hiera/.*
irrelevant-files: *irrelevant_scenario_files
- tripleo-ci-centos-8-scenario003-standalone: &scenario003
vars: *sa_consumer_vars
dependencies: *deps
dependencies: *deps_cprovider
files:
- ^tripleo_ansible/roles/tripleo-create-admin/.*
- ^tripleo_ansible/roles/tripleo-hieradata/.*
- ^tripleo_ansible/roles/tripleo-upgrade-hiera/.*
- ^tripleo_ansible/roles/tripleo-create-admin/.*
- ^tripleo_ansible/roles/tripleo-hieradata/.*
- ^tripleo_ansible/roles/tripleo-upgrade-hiera/.*
irrelevant-files: *irrelevant_scenario_files
- tripleo-ci-centos-8-scenario004-standalone: &scenario004
vars: *sa_consumer_vars
dependencies: *deps
dependencies: *deps_cprovider
files:
- ^tripleo_ansible/roles/tripleo-ceph-.*/.*
- ^tripleo_ansible/roles/tripleo-ceph-.*/.*
irrelevant-files: *irrelevant_scenario_files
- tripleo-ci-centos-8-scenario010-standalone: &scenario010
vars: *sa_consumer_vars
dependencies: *deps
dependencies: *deps_cprovider
files:
- ^tripleo_ansible/.*octavia.*
- ^tripleo_ansible/.*octavia.*
irrelevant-files: *irrelevant_scenario_files
gate:
jobs:
- openstack-tox-linters
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-7-content-provider: *content_provider_c7
- tripleo-ci-centos-8-content-provider: *content_provider
- openstack-tox-docs: *tripleo-docs
- tripleo-ci-centos-7-containers-multinode: *containers_multinode_c7
- tripleo-ci-centos-8-containers-multinode: *containers_multinode


Loading…
Cancel
Save