From 3a77c7d319cffb82f24f1d3c1fd160d4f15ae198 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/litmus.yaml zuul.d/unit.yaml Change-Id: I3faa7437b38a38037dda709032ddaf716c1b9d22 (cherry picked from commit bffd679b69b7f599340cd2967d5858b5a1d9a099) (cherry picked from commit c058d2772ccb8c2aa9f8c19bc88fa25d12f681b8) (cherry picked from commit a67d43f7393ca43b2ad708a8e566316b59ce417a) --- zuul.d/layout.yaml | 2 -- zuul.d/libraries.yaml | 9 --------- zuul.d/litmus.yaml | 18 ------------------ zuul.d/unit.yaml | 10 ---------- 4 files changed, 39 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 59674e4d1..efaf7b000 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -32,12 +32,10 @@ - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal - puppet-openstack-libraries-puppet-unit-7.10-centos-8-stream - puppet-openstack-libraries-puppet-unit-7.10-ubuntu-focal - - puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal - puppet-openstack-libraries-litmus-6.21-ubuntu-focal - puppet-openstack-libraries-litmus-7.10-centos-8-stream - puppet-openstack-libraries-litmus-7.10-centos-9-stream - puppet-openstack-libraries-litmus-7.10-ubuntu-focal - - puppet-openstack-libraries-litmus-latest-ubuntu-focal gate: jobs: - puppet-openstack-libraries-puppet-lint-ubuntu-focal diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml index 93443dba8..fef26eea9 100644 --- a/zuul.d/libraries.yaml +++ b/zuul.d/libraries.yaml @@ -23,12 +23,3 @@ vars: puppet_gem_version: 7.10.0 rspec_puppet_version: '= 2.9.0' - -- job: - name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal - parent: puppet-openstack-libraries-puppet-unit-base - nodeset: ubuntu-focal - voting: false - vars: - puppet_gem_version: latest - rspec_puppet_version: '= 2.9.0' diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index 3be3be6ec..a293bb153 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -73,15 +73,6 @@ puppet_gem_version: 7.10.0 ceph: pacific -- job: - name: puppet-openstack-litmus-latest-ubuntu-focal - parent: puppet-openstack-litmus-module-base - nodeset: ubuntu-focal - voting: false - vars: - puppet_gem_version: latest - ceph: pacific - - job: name: puppet-openstack-libraries-litmus-7.10-centos-8-stream parent: puppet-openstack-litmus-libraries-base @@ -112,14 +103,6 @@ vars: puppet_gem_version: 7.10.0 -- job: - name: puppet-openstack-libraries-litmus-latest-ubuntu-focal - parent: puppet-openstack-litmus-libraries-base - voting: false - nodeset: ubuntu-focal - vars: - puppet_gem_version: latest - - project-template: name: puppet-openstack-litmus-jobs check: @@ -128,7 +111,6 @@ - puppet-openstack-litmus-7.10-centos-8-stream - puppet-openstack-litmus-7.10-centos-9-stream - puppet-openstack-litmus-7.10-ubuntu-focal - - puppet-openstack-litmus-latest-ubuntu-focal gate: jobs: - puppet-openstack-litmus-7.10-centos-8-stream diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml index 3133dc5b5..082e9147f 100644 --- a/zuul.d/unit.yaml +++ b/zuul.d/unit.yaml @@ -24,15 +24,6 @@ puppet_gem_version: 7.10.0 rspec_puppet_version: '= 2.9.0' -- job: - name: puppet-openstack-unit-latest-ubuntu-focal - parent: puppet-openstack-unit-base - nodeset: ubuntu-focal - voting: false - vars: - puppet_gem_version: latest - rspec_puppet_version: '= 2.9.0' - - project-template: name: puppet-openstack-module-unit-jobs check: @@ -40,7 +31,6 @@ - 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-7.10-centos-8-stream