diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 6bf3fe635..7727296c9 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -176,14 +176,6 @@ - ^setup.cfg$ - ^setup.py$ -- job: - name: puppet-openstack-beaker-centos-7 - parent: puppet-openstack-beaker-run-base - nodeset: centos-7 - vars: - nodepool_type: centos7 - puppet_gem_version: 5.5 - - job: name: puppet-openstack-beaker-centos-8 parent: puppet-openstack-beaker-run-base diff --git a/zuul.d/beaker.yaml b/zuul.d/beaker.yaml index 2dab60312..326a8ce74 100644 --- a/zuul.d/beaker.yaml +++ b/zuul.d/beaker.yaml @@ -2,34 +2,11 @@ name: puppet-openstack-beaker-jobs check: jobs: - - puppet-openstack-beaker-centos-7 - puppet-openstack-beaker-centos-8 - puppet-openstack-beaker-ubuntu-bionic gate: jobs: - - puppet-openstack-beaker-centos-7 - -- job: - name: puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - parent: puppet-openstack-integration-base - pre-run: playbooks/prepare-node-beaker.yaml - post-run: playbooks/upload-logs.yaml - run: playbooks/run-libraries-beaker-tests.yaml - timeout: 3600 - nodeset: centos-7 - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^test-requirements.txt$ - - ^LICENSE$ - - ^.gitignore$ - vars: - nodepool_type: centos7 - puppet_gem_version: 5.5.0 + - puppet-openstack-beaker-centos-8 - job: name: puppet-openstack-libraries-puppet-beaker-rspec-centos-8 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 4e51ada87..6447d76fe 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -34,7 +34,6 @@ - puppet-openstack-libraries-puppet-unit-6.11-centos-8 - puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic - - puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - puppet-openstack-libraries-puppet-beaker-rspec-centos-8 - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic gate: @@ -46,7 +45,7 @@ - puppet-openstack-libraries-puppet-unit-5.5-centos-8 - puppet-openstack-libraries-puppet-unit-6.11-centos-8 - puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic - - puppet-openstack-libraries-puppet-beaker-rspec-centos-7 + - puppet-openstack-libraries-puppet-beaker-rspec-centos-8 # integration jobs - project-template: