diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 857d6a55f..3430ee3da 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -42,8 +42,8 @@ jobs: - puppet-openstack-libraries-puppet-lint-ubuntu-focal - puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal - - puppet-openstack-libraries-puppet-unit-7.10-centos-8-stream - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal + - puppet-openstack-libraries-puppet-unit-7.10-centos-8-stream - puppet-openstack-libraries-litmus-7.10-centos-8-stream # integration jobs diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml index b0018a520..93443dba8 100644 --- a/zuul.d/libraries.yaml +++ b/zuul.d/libraries.yaml @@ -1,13 +1,6 @@ --- # This file contains the jobs for the puppet openstack libraries # -- job: - name: puppet-openstack-libraries-puppet-unit-6.21-centos-8-stream - parent: puppet-openstack-libraries-puppet-unit-base - nodeset: centos-8-stream - vars: - puppet_gem_version: 6.21.1 - - job: name: puppet-openstack-libraries-puppet-unit-7.10-centos-8-stream parent: puppet-openstack-libraries-puppet-unit-base diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml index dcc82a181..3133dc5b5 100644 --- a/zuul.d/unit.yaml +++ b/zuul.d/unit.yaml @@ -1,13 +1,6 @@ --- # This file contains the puppet unit job configurations # -- job: - name: puppet-openstack-unit-6.21-centos-8-stream - parent: puppet-openstack-unit-base - nodeset: centos-8-stream - vars: - puppet_gem_version: 6.21.1 - - job: name: puppet-openstack-unit-7.10-centos-8-stream parent: puppet-openstack-unit-base @@ -44,14 +37,12 @@ name: puppet-openstack-module-unit-jobs check: jobs: - - puppet-openstack-unit-6.21-centos-8-stream - puppet-openstack-unit-7.10-centos-8-stream - puppet-openstack-unit-6.21-ubuntu-focal - puppet-openstack-unit-7.10-ubuntu-focal - puppet-openstack-unit-latest-ubuntu-focal gate: jobs: - - puppet-openstack-unit-6.21-centos-8-stream - puppet-openstack-unit-7.10-centos-8-stream - puppet-openstack-unit-6.21-ubuntu-focal - puppet-openstack-unit-7.10-ubuntu-focal