commit 1914b7ed1e499d13af4952992d0bf1728ca4db8e Author: Takashi Kajinami Date: Tue Oct 13 00:53:41 2020 +0900 Skip unnecessary tests for release cut off tox.ini only affects releasenote geneneration thus any change in that file doesn't need puppet tests. Also, .gitreview doesn't affect puppet functinality so we can skip most of the tests. This change also fixes some minor inconsisntencies about ignored files between jobs. Change-Id: I86c3643275abd9db5933a22109d6c574c90c0f10 diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index e007a9e..3673f2d 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -67,9 +67,11 @@ - ^requirements.txt$ - ^test-requirements.txt$ - ^LICENSE$ + - ^.gitreview$ - ^.gitignore$ - ^setup.cfg$ - ^setup.py$ + - ^tox.ini$ roles: - zuul: zuul/zuul-jobs # NOTE(tobias-urdin): The ceph variable must be provided with a default here @@ -105,9 +107,11 @@ - ^requirements.txt$ - ^test-requirements.txt$ - ^LICENSE$ + - ^.gitreview$ - ^.gitignore$ - ^setup.cfg$ - ^setup.py$ + - ^tox.ini$ - job: name: puppet-openstack-unit-base @@ -126,9 +130,11 @@ - ^test-requirements.txt$ - ^spec/acceptance/.*$ - ^LICENSE$ + - ^.gitreview$ - ^.gitignore$ - ^setup.cfg$ - ^setup.py$ + - ^tox.ini$ # TODO(tobias-urdin): Remove when we use rspec-puppet 2.7.1 vars: rspec_puppet_version: '~> 2.3.0' @@ -146,11 +152,14 @@ - ^etc/.*$ - ^metadata.json$ - ^releasenotes/.*$ + - ^requirements.txt$ - ^test-requirements.txt$ - ^LICENSE$ + - ^.gitreview$ - ^.gitignore$ - ^setup.cfg$ - ^setup.py$ + - ^tox.ini$ # TODO(tobias-urdin): Remove when we use rspec-puppet 2.7.1 vars: rspec_puppet_version: '~> 2.3.0' diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml index 13573f9..991a0ee 100644 --- a/zuul.d/linters.yaml +++ b/zuul.d/linters.yaml @@ -4,11 +4,19 @@ parent: puppet-openstack-module-base run: playbooks/run-lint-tests.yaml irrelevant-files: + - ^.*\.md$ + - ^.*\.rst$ - ^doc/.*$ - ^etc/.*$ - ^releasenotes/.*$ - ^requirements.txt$ - ^test-requirements.txt$ + - ^LICENSE$ + - ^.gitignore$ + - ^.gitreview$ + - ^setup.cfg$ + - ^setup.py$ + - ^tox.ini$ - job: name: puppet-openstack-syntax-6-ubuntu-bionic @@ -39,6 +47,10 @@ - ^test-requirements.txt$ - ^LICENSE$ - ^.gitignore$ + - ^.gitreview$ + - ^setup.cfg$ + - ^setup.py$ + - ^tox.ini$ - job: name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index 485688a..fe7dc11 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -19,9 +19,11 @@ - ^test-requirements.txt$ - ^metadata.json$ - ^LICENSE$ + - ^.gitreview$ - ^.gitignore$ - ^setup.cfg$ - ^setup.py$ + - ^tox.ini$ - job: name: puppet-openstack-litmus-module-base diff --git a/zuul.d/tripleo.yaml b/zuul.d/tripleo.yaml index 1bc8709..0343f36 100644 --- a/zuul.d/tripleo.yaml +++ b/zuul.d/tripleo.yaml @@ -11,11 +11,14 @@ - ^etc/.*$ - ^metadata.json$ - ^releasenotes/.*$ + - ^requirements.txt$ - ^test-requirements.txt$ - ^LICENSE$ + - ^.gitreview$ - ^.gitignore$ - ^setup.cfg$ - ^setup.py$ + - ^tox.ini$ - project-template: name: tripleo-puppet-undercloud @@ -37,11 +40,14 @@ - ^metadata.json$ - ^releasenotes/.*$ - ^spec/.*$ + - ^requirements.txt$ - ^test-requirements.txt$ - ^LICENSE$ + - ^.gitreview$ - ^.gitignore$ - ^setup.cfg$ - ^setup.py$ + - ^tox.ini$ - job: name: tripleo-puppet-ci-centos-8-standalone