From d572706ee8867296c4b0a5f295168b5a97caeff7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 29 Jul 2020 20:55:52 +0900
Subject: [PATCH] Disable CentOS7 beaker job

This patch disables CentOS7 beaker job so that we can switch to CentOS8
to run beaker tests, since CentOS7 is no longer supported.
Currently CentOS8 beaker job is still non-voting, but will be made
voting soon once we adjust current pinning for CentOS7[1]

[1] https://review.opendev.org/#/c/726498/

Conflicts:
	zuul.d/layout.yaml

Change-Id: Iad2dc427919788f8fc9122a05cd36d9d6e50b11a
(cherry picked from commit 7c4b45ba46ee4af5ab1d00700c6ce802e468eda5)
---
 zuul.d/base.yaml   |  8 --------
 zuul.d/beaker.yaml | 25 +------------------------
 zuul.d/layout.yaml |  3 +--
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index cac9e4964..c8f7e9731 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: