Remove layout overrides and use tripleo-ci templates instead
As part of [1] and in line with all other tripleo repos lets use the tripleo-ci templates. The files: and irrelevant-files matches are moved to tripleo-ci in the depends-on. This leaves only the undercloud-minion job in the overrides as it isn't covered by the templates, but updates tags. [1] https://review.opendev.org/q/topic:tripleo-ci-reduce Depends-On: https://review.opendev.org/c/openstack/tripleo-ci/+/781322 Change-Id: Id8bdcc314f68fb35050254c6c64fd2317c2555de (cherry picked from commite9b7aaa5fc
) (cherry picked from commit5c6eb5887a
)
This commit is contained in:
parent
4f513aeb85
commit
0e8cb2df87
|
@ -4,9 +4,14 @@
|
||||||
- tripleo-ansible-molecule-jobs
|
- tripleo-ansible-molecule-jobs
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
- openstack-python3-ussuri-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
|
- tripleo-multinode-container-minimal-pipeline
|
||||||
|
- tripleo-standalone-scenarios-pipeline
|
||||||
|
- tripleo-undercloud-jobs-pipeline
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- tripleo-ci-centos-8-content-provider:
|
- tripleo-ci-centos-8-content-provider:
|
||||||
|
dependencies:
|
||||||
|
- openstack-tox-linters
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^tox.ini$
|
- ^tox.ini$
|
||||||
- openstack-tox-linters: &tripleo-linters
|
- openstack-tox-linters: &tripleo-linters
|
||||||
|
@ -17,19 +22,16 @@
|
||||||
- ^molecule-requirements.txt
|
- ^molecule-requirements.txt
|
||||||
- ^README.rst
|
- ^README.rst
|
||||||
- ^requirements.txt
|
- ^requirements.txt
|
||||||
- tripleo-ci-centos-8-content-provider
|
- tripleo-ci-centos-8-containers-undercloud-minion: &undercloud_minion
|
||||||
- tripleo-ci-centos-8-containers-multinode: &containers_multinode
|
vars:
|
||||||
vars: &multinode_vars
|
|
||||||
consumer_job: true
|
consumer_job: true
|
||||||
build_container_images: false
|
|
||||||
remove_tags:
|
remove_tags:
|
||||||
- build
|
- build
|
||||||
dependencies: &deps
|
dependencies:
|
||||||
- openstack-tox-linters
|
|
||||||
- tripleo-ci-centos-8-content-provider
|
- tripleo-ci-centos-8-content-provider
|
||||||
files: &containers_files
|
files:
|
||||||
- ^tripleo_ansible/.*
|
- ^tripleo_ansible/.*
|
||||||
irrelevant-files: &irrelevant_scenario_files
|
irrelevant-files:
|
||||||
- .*.md$
|
- .*.md$
|
||||||
- .*.rst$
|
- .*.rst$
|
||||||
- .*.txt$
|
- .*.txt$
|
||||||
|
@ -37,82 +39,17 @@
|
||||||
- ^scripts/.*
|
- ^scripts/.*
|
||||||
- ^tox.ini$
|
- ^tox.ini$
|
||||||
- ^tripleo_ansible/playbooks/docker-vfs-setup.yml$
|
- ^tripleo_ansible/playbooks/docker-vfs-setup.yml$
|
||||||
- ^tripleo_ansible/.*molecule.*
|
- ^tripleo_ansible/roles/.*/molecule.*
|
||||||
- ^tripleo_ansible/.*meta.*
|
- ^tripleo_ansible/roles/.*/meta
|
||||||
- ^tripleo_ansible/roles/test_deps/.*
|
- ^tripleo_ansible/roles/test_deps/.*
|
||||||
- ^zuul.d/.*
|
- ^zuul.d/.*
|
||||||
- tripleo-ci-centos-8-standalone: &basic_standalone
|
|
||||||
vars: &standalone_vars
|
|
||||||
consumer_job: true
|
|
||||||
build_container_images: false
|
|
||||||
tags:
|
|
||||||
- standalone
|
|
||||||
dependencies: *deps
|
|
||||||
files: *containers_files
|
|
||||||
irrelevant-files: *irrelevant_scenario_files
|
|
||||||
- tripleo-ci-centos-8-containers-undercloud-minion: &undercloud_minion
|
|
||||||
vars: &undercloud_vars
|
|
||||||
consumer_job: true
|
|
||||||
remove_tags:
|
|
||||||
- build
|
|
||||||
dependencies: *deps
|
|
||||||
files: *containers_files
|
|
||||||
irrelevant-files: *irrelevant_scenario_files
|
|
||||||
- tripleo-ci-centos-8-undercloud-containers: &undercloud_containers
|
|
||||||
vars: *undercloud_vars
|
|
||||||
dependencies: *deps
|
|
||||||
files: *containers_files
|
|
||||||
irrelevant-files: *irrelevant_scenario_files
|
|
||||||
- tripleo-ci-centos-8-scenario001-standalone: &scenario001
|
|
||||||
vars: *standalone_vars
|
|
||||||
dependencies: *deps
|
|
||||||
files:
|
|
||||||
- ^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: *standalone_vars
|
|
||||||
dependencies: *deps
|
|
||||||
files:
|
|
||||||
- ^tripleo_ansible/roles/tripleo_hieradata/.*
|
|
||||||
- ^tripleo_ansible/roles/tripleo_upgrade_hiera/.*
|
|
||||||
irrelevant-files: *irrelevant_scenario_files
|
|
||||||
- tripleo-ci-centos-8-scenario003-standalone: &scenario003
|
|
||||||
vars: *standalone_vars
|
|
||||||
dependencies: *deps
|
|
||||||
files:
|
|
||||||
- ^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: *standalone_vars
|
|
||||||
dependencies: *deps
|
|
||||||
files:
|
|
||||||
- ^tripleo_ansible/roles/tripleo_ceph_.*/.*
|
|
||||||
irrelevant-files: *irrelevant_scenario_files
|
|
||||||
- tripleo-ci-centos-8-scenario010-standalone: &scenario010
|
|
||||||
vars: *standalone_vars
|
|
||||||
dependencies: *deps
|
|
||||||
files:
|
|
||||||
- ^tripleo_ansible/roles/octavia_.*/.*
|
|
||||||
irrelevant-files: *irrelevant_scenario_files
|
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
|
- tripleo-ci-centos-8-content-provider
|
||||||
- openstack-tox-linters: *tripleo-linters
|
- openstack-tox-linters: *tripleo-linters
|
||||||
- openstack-tox-docs: *tripleo-docs
|
- openstack-tox-docs: *tripleo-docs
|
||||||
- tripleo-ci-centos-8-content-provider
|
|
||||||
- tripleo-ci-centos-8-containers-multinode: *containers_multinode
|
|
||||||
- tripleo-ci-centos-8-containers-undercloud-minion: *undercloud_minion
|
- tripleo-ci-centos-8-containers-undercloud-minion: *undercloud_minion
|
||||||
- tripleo-ci-centos-8-undercloud-containers: *undercloud_containers
|
|
||||||
- tripleo-ci-centos-8-standalone: *basic_standalone
|
|
||||||
- tripleo-ci-centos-8-scenario001-standalone: *scenario001
|
|
||||||
- tripleo-ci-centos-8-scenario002-standalone: *scenario002
|
|
||||||
- tripleo-ci-centos-8-scenario003-standalone: *scenario003
|
|
||||||
- tripleo-ci-centos-8-scenario004-standalone: *scenario004
|
|
||||||
- tripleo-ci-centos-8-scenario010-standalone: *scenario010
|
|
||||||
post:
|
post:
|
||||||
jobs:
|
jobs:
|
||||||
- publish-openstack-python-branch-tarball
|
- publish-openstack-python-branch-tarball
|
||||||
|
|
Loading…
Reference in New Issue