Switch all CentOS 8 jobs to CentOS 8 Stream

... because RDO Wallay won't support CentOS 8 but only CentOS 8 Stream. Change-Id: Id76ef3fe2db8888b7d409d7014e775b4c780083f
2021-03-16 23:14:46 +09:00 · 2021-03-16 23:14:46 +09:00 · a75e47446a
commit a75e47446a
parent 7e2728f284
6 changed files with 10 additions and 91 deletions
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@ -20,16 +20,10 @@
    nodeset: ubuntu-bionic
    voting: false

- job:
-    name: puppet-openstack-integration-6-scenario001-tempest-centos-8
-    parent: puppet-openstack-integration-6-scenario001
-    nodeset: centos-8
-
 - job:
    name: puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
    parent: puppet-openstack-integration-6-scenario001
    nodeset: centos-8-stream
-    voting: false

 - job:
    name: puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
@ -51,16 +45,10 @@
    nodeset: ubuntu-bionic
    voting: false

- job:
-    name: puppet-openstack-integration-6-scenario002-tempest-centos-8
-    parent: puppet-openstack-integration-6-scenario002
-    nodeset: centos-8
-
 - job:
    name: puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
    parent: puppet-openstack-integration-6-scenario002
    nodeset: centos-8-stream
-    voting: false

 - job:
    name: puppet-openstack-integration-6-scenario002-tempest-debian-stable
@ -82,16 +70,10 @@
    nodeset: ubuntu-bionic
    voting: false

- job:
-    name: puppet-openstack-integration-6-scenario003-tempest-centos-8
-    parent: puppet-openstack-integration-6-scenario003
-    nodeset: centos-8
-
 - job:
    name: puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
    parent: puppet-openstack-integration-6-scenario003
    nodeset: centos-8-stream
-    voting: false

 - job:
    name: puppet-openstack-integration-6-scenario003-tempest-debian-stable
@ -114,16 +96,10 @@
    nodeset: ubuntu-bionic
    voting: false

- job:
-    name: puppet-openstack-integration-6-scenario004-tempest-centos-8
-    parent: puppet-openstack-integration-6-scenario004
-    nodeset: centos-8
-
 - job:
    name: puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
    parent: puppet-openstack-integration-6-scenario004
    nodeset: centos-8-stream
-    voting: false

 - job:
    name: puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@ -25,24 +25,19 @@
    check:
      jobs:
        - puppet-openstack-libraries-puppet-lint-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-syntax-6-centos-8
        - puppet-openstack-libraries-puppet-syntax-6-centos-8-stream
        - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-unit-6.14-centos-8
        - puppet-openstack-libraries-puppet-unit-6.14-centos-8-stream
        - puppet-openstack-libraries-puppet-unit-6.14-ubuntu-bionic
        - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
-        - puppet-openstack-libraries-litmus-centos-8
        - puppet-openstack-libraries-litmus-centos-8-stream
        - puppet-openstack-libraries-litmus-ubuntu-bionic
    gate:
      jobs:
        - puppet-openstack-libraries-puppet-lint-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-syntax-6-centos-8
+        - puppet-openstack-libraries-puppet-syntax-6-centos-8-stream
        - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-unit-6.14-centos-8
        - puppet-openstack-libraries-puppet-unit-6.14-ubuntu-bionic
-        - puppet-openstack-libraries-litmus-centos-8
        - puppet-openstack-libraries-litmus-centos-8-stream

 # integration jobs
@ -54,20 +49,16 @@
        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario001-tempest-centos-8
-        - puppet-openstack-integration-6-scenario002-tempest-centos-8
-        - puppet-openstack-integration-6-scenario003-tempest-centos-8
-        - puppet-openstack-integration-6-scenario004-tempest-centos-8
        - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
        - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
        - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
        - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
    gate:
      jobs:
-        - puppet-openstack-integration-6-scenario001-tempest-centos-8
-        - puppet-openstack-integration-6-scenario002-tempest-centos-8
-        - puppet-openstack-integration-6-scenario003-tempest-centos-8
-        - puppet-openstack-integration-6-scenario004-tempest-centos-8
+        - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
+        - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
+        - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
+        - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
    experimental:
      jobs:
        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
@ -80,12 +71,11 @@
    check:
      jobs:
        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario001-tempest-centos-8
        - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
    gate:
      jobs:
        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario001-tempest-centos-8
+        - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
    experimental:
      jobs:
        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
@ -95,12 +85,11 @@
    check:
      jobs:
        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario002-tempest-centos-8
        - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
    gate:
      jobs:
        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario002-tempest-centos-8
+        - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
    experimental:
      jobs:
        - puppet-openstack-integration-6-scenario002-tempest-debian-stable
@ -110,11 +99,10 @@
    check:
      jobs:
        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario003-tempest-centos-8
        - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
    gate:
      jobs:
-        - puppet-openstack-integration-6-scenario003-tempest-centos-8
+        - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
    experimental:
      jobs:
        - puppet-openstack-integration-6-scenario003-tempest-debian-stable
@ -124,11 +112,10 @@
    check:
      jobs:
        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario004-tempest-centos-8
        - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
    gate:
      jobs:
-        - puppet-openstack-integration-6-scenario004-tempest-centos-8
+        - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
    experimental:
      jobs:
        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@ -1,18 +1,10 @@
 ---
 # This file contains the jobs for the puppet openstack libraries
 #
- job:
-    name: puppet-openstack-libraries-puppet-unit-6.14-centos-8
-    parent: puppet-openstack-libraries-puppet-unit-base
-    nodeset: centos-8
-    vars:
-      puppet_gem_version: 6.14.0
-
 - job:
    name: puppet-openstack-libraries-puppet-unit-6.14-centos-8-stream
    parent: puppet-openstack-libraries-puppet-unit-base
    nodeset: centos-8-stream
-    voting: false
    vars:
      puppet_gem_version: 6.14.0

--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@ -58,17 +58,9 @@
    vars:
      puppet: 6

- job:
-    name: puppet-openstack-libraries-puppet-syntax-6-centos-8
-    parent: puppet-openstack-libraries-puppet-syntax
-    nodeset: centos-8
-    vars:
-      puppet: 6
-
 - job:
    name: puppet-openstack-libraries-puppet-syntax-6-centos-8-stream
    parent: puppet-openstack-libraries-puppet-syntax
    nodeset: centos-8-stream
-    voting: false
    vars:
      puppet: 6
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@ -37,19 +37,10 @@
    abstract: true
    run: playbooks/run-libraries-litmus-tests.yaml

- job:
-    name: puppet-openstack-litmus-centos-8
-    parent: puppet-openstack-litmus-module-base
-    nodeset: centos-8
-    vars:
-      puppet_gem_version: 6.16
-      ceph: nautilus
-
 - job:
    name: puppet-openstack-litmus-centos-8-stream
    parent: puppet-openstack-litmus-module-base
    nodeset: centos-8-stream
-    voting: false
    vars:
      puppet_gem_version: 6.16
      ceph: nautilus
@ -63,17 +54,9 @@
      puppet_gem_version: latest
      ceph: nautilus

- job:
-    name: puppet-openstack-libraries-litmus-centos-8
-    parent: puppet-openstack-litmus-libraries-base
-    nodeset: centos-8
-    vars:
-      puppet_gem_version: 6.18.0
-
 - job:
    name: puppet-openstack-libraries-litmus-centos-8-stream
    parent: puppet-openstack-litmus-libraries-base
-    voting: false
    nodeset: centos-8-stream
    vars:
      puppet_gem_version: 6.18.0
@ -90,11 +73,9 @@
    name: puppet-openstack-litmus-jobs
    check:
      jobs:
-        - puppet-openstack-litmus-centos-8
        - puppet-openstack-litmus-centos-8-stream
        - puppet-openstack-litmus-ubuntu-bionic
    gate:
      jobs:
-        - puppet-openstack-litmus-centos-8
        - puppet-openstack-litmus-centos-8-stream
        - puppet-openstack-litmus-ubuntu-bionic
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@ -1,18 +1,10 @@
 ---
 # This file contains the puppet unit job configurations
 #
- job:
-    name: puppet-openstack-unit-6.14-centos-8
-    parent: puppet-openstack-unit-base
-    nodeset: centos-8
-    vars:
-      puppet_gem_version: 6.14.0
-
 - job:
    name: puppet-openstack-unit-6.14-centos-8-stream
    parent: puppet-openstack-unit-base
    nodeset: centos-8-stream
-    voting: false
    vars:
      puppet_gem_version: 6.14.0

@ -38,11 +30,10 @@
    name: puppet-openstack-module-unit-jobs
    check:
      jobs:
-        - puppet-openstack-unit-6.14-centos-8
        - puppet-openstack-unit-6.14-centos-8-stream
        - puppet-openstack-unit-6.14-ubuntu-bionic
        - puppet-openstack-unit-latest-ubuntu-bionic
    gate:
      jobs:
-        - puppet-openstack-unit-6.14-centos-8
+        - puppet-openstack-unit-6.14-centos-8-stream
        - puppet-openstack-unit-6.14-ubuntu-bionic