From c058d2772ccb8c2aa9f8c19bc88fa25d12f681b8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 8 Nov 2023 09:50:49 +0900 Subject: [PATCH] stably-only: Remove tests with latest puppet These jobs are kept so that we can check upcoming incompatibility during our development cycle. So these are not useful for stable branch maintenance. Conflicts: zuul.d/layout.yaml zuul.d/libraries.yaml zuul.d/unit.yaml Change-Id: I3faa7437b38a38037dda709032ddaf716c1b9d22 (cherry picked from commit bffd679b69b7f599340cd2967d5858b5a1d9a099) --- zuul.d/layout.yaml | 2 -- zuul.d/libraries.yaml | 10 ---------- zuul.d/litmus.yaml | 17 ----------------- zuul.d/unit.yaml | 11 ----------- 4 files changed, 40 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 41a6559a6..3a058f77f 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -28,10 +28,8 @@ - puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy - puppet-openstack-libraries-puppet-unit-7.22-centos-9-stream - puppet-openstack-libraries-puppet-unit-7.22-ubuntu-jammy - - puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy - puppet-openstack-libraries-litmus-7.22-centos-9-stream - puppet-openstack-libraries-litmus-7.22-ubuntu-jammy - - puppet-openstack-libraries-litmus-latest-ubuntu-jammy gate: jobs: - puppet-openstack-libraries-puppet-lint-ubuntu-jammy diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml index a4fe7a0a7..94798e35b 100644 --- a/zuul.d/libraries.yaml +++ b/zuul.d/libraries.yaml @@ -18,13 +18,3 @@ puppet_gem_version: 7.22.0 # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support rspec_puppet_version: '~> 2.10.0' - -- job: - name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy - parent: puppet-openstack-libraries-puppet-unit-base - nodeset: ubuntu-jammy - voting: false - vars: - puppet_gem_version: latest - # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support - rspec_puppet_version: '~> 2.10.0' diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index e46d33a73..855488ecb 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -56,14 +56,6 @@ vars: puppet_gem_version: 7.22.0 -- job: - name: puppet-openstack-litmus-latest-ubuntu-jammy - parent: puppet-openstack-litmus-module-base - nodeset: ubuntu-jammy - voting: false - vars: - puppet_gem_version: latest - - job: name: puppet-openstack-libraries-litmus-7.22-centos-9-stream parent: puppet-openstack-litmus-libraries-base @@ -79,21 +71,12 @@ vars: puppet_gem_version: 7.22.0 -- job: - name: puppet-openstack-libraries-litmus-latest-ubuntu-jammy - parent: puppet-openstack-litmus-libraries-base - voting: false - nodeset: ubuntu-jammy - vars: - puppet_gem_version: latest - - project-template: name: puppet-openstack-litmus-jobs check: jobs: - puppet-openstack-litmus-7.22-centos-9-stream - puppet-openstack-litmus-7.22-ubuntu-jammy - - puppet-openstack-litmus-latest-ubuntu-jammy gate: jobs: - puppet-openstack-litmus-7.22-centos-9-stream diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml index 1752ed3f8..8f4979b9d 100644 --- a/zuul.d/unit.yaml +++ b/zuul.d/unit.yaml @@ -19,23 +19,12 @@ # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support rspec_puppet_version: '~> 2.10.0' -- job: - name: puppet-openstack-unit-latest-ubuntu-jammy - parent: puppet-openstack-unit-base - nodeset: ubuntu-jammy - voting: false - vars: - puppet_gem_version: latest - # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support - rspec_puppet_version: '~> 2.10.0' - - project-template: name: puppet-openstack-module-unit-jobs check: jobs: - puppet-openstack-unit-7.22-centos-9-stream - puppet-openstack-unit-7.22-ubuntu-jammy - - puppet-openstack-unit-latest-ubuntu-jammy gate: jobs: - puppet-openstack-unit-7.22-centos-9-stream