From 6332bc5d52486ed3fa0410ed0ba5b540e4f6f4fd Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 27 Apr 2022 14:39:30 -0400 Subject: [PATCH] ceph-{ansible,container}*: Use CentOS8 builders instead of 7 Signed-off-by: David Galloway --- .../config/definitions/ceph-ansible-docs-prs.yml | 2 +- .../config/definitions/ceph-ansible-nightly.yml | 2 +- ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml | 6 +++--- ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml | 2 +- .../config/definitions/ceph-container-flake8.yml | 2 +- .../config/definitions/ceph-container-lint.yml | 2 +- .../config/definitions/ceph-container-nightly.yml | 2 +- .../config/definitions/ceph-container-prs.yml | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml b/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml index fe2fc401..c5362c48 100644 --- a/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml +++ b/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml @@ -1,6 +1,6 @@ - job: name: ceph-ansible-docs-pull-requests - node: (small && (centos7 || trusty)) || (vagrant && libvirt && smithi) + node: (small && (centos8 || trusty)) || (vagrant && libvirt && smithi) project-type: freestyle defaults: global display-name: 'ceph-ansible: docs pull requests' diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml index b11262c3..657e9236 100644 --- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml +++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml @@ -31,7 +31,7 @@ - job-template: name: 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}' - node: vagrant&&libvirt&¢os7 + node: vagrant&&libvirt&¢os8 concurrent: true defaults: global display-name: 'ceph-ansible: Nightly [{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}]' diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index b4e41e6f..3daf5a97 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -23,7 +23,7 @@ - project: name: ceph-ansible-prs - slave_labels: 'vagrant && libvirt && (smithi || braggi || centos7)' + slave_labels: 'vagrant && libvirt && (smithi || braggi || centos8)' distribution: - centos deployment: @@ -39,7 +39,7 @@ - project: name: ceph-ansible-prs-docker2podman - slave_labels: 'vagrant && libvirt && (smithi || braggi || centos7)' + slave_labels: 'vagrant && libvirt && (smithi || braggi || centos8)' distribution: - centos deployment: @@ -77,7 +77,7 @@ - project: name: ceph-ansible-prs-common-trigger - slave_labels: 'vagrant && libvirt && (smithi || braggi || centos7)' + slave_labels: 'vagrant && libvirt && (smithi || braggi || centos8)' distribution: - centos deployment: diff --git a/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml index e0188092..482d17b3 100644 --- a/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml +++ b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml @@ -1,6 +1,6 @@ - job: name: ceph-ansible-rpm - node: 'centos7 && x86_64 && small && !sepia' + node: 'centos8 && x86_64 && small && !sepia' project-type: freestyle defaults: global disabled: false diff --git a/ceph-container-flake8/config/definitions/ceph-container-flake8.yml b/ceph-container-flake8/config/definitions/ceph-container-flake8.yml index 99b638c4..cffab878 100644 --- a/ceph-container-flake8/config/definitions/ceph-container-flake8.yml +++ b/ceph-container-flake8/config/definitions/ceph-container-flake8.yml @@ -14,7 +14,7 @@ - job: name: ceph-container-flake8 - node: small && centos7 + node: small && centos8 defaults: global display-name: 'ceph-container-flake8' properties: diff --git a/ceph-container-lint/config/definitions/ceph-container-lint.yml b/ceph-container-lint/config/definitions/ceph-container-lint.yml index b71e7985..edf9019a 100644 --- a/ceph-container-lint/config/definitions/ceph-container-lint.yml +++ b/ceph-container-lint/config/definitions/ceph-container-lint.yml @@ -14,7 +14,7 @@ - job: name: ceph-container-lint - node: small && centos7 + node: small && centos8 defaults: global display-name: 'ceph-container-lint' properties: diff --git a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml index 24558054..bd76bd81 100644 --- a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml +++ b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml @@ -9,7 +9,7 @@ - job-template: name: 'ceph-container-nightly-ceph_ansible-{test}' - node: vagrant&&libvirt&¢os7 + node: vagrant&&libvirt&¢os8 concurrent: true defaults: global display-name: 'ceph-container: Nightly tests [ceph_ansible-{test}]' diff --git a/ceph-container-prs/config/definitions/ceph-container-prs.yml b/ceph-container-prs/config/definitions/ceph-container-prs.yml index 076be0c0..bfaffa8d 100644 --- a/ceph-container-prs/config/definitions/ceph-container-prs.yml +++ b/ceph-container-prs/config/definitions/ceph-container-prs.yml @@ -10,7 +10,7 @@ - job-template: name: 'ceph-container-prs-ceph_ansible-{test}' id: 'ceph-container-prs-auto' - node: vagrant&&libvirt&¢os7 + node: vagrant&&libvirt&¢os8 concurrent: true defaults: global display-name: 'ceph-container: Pull Requests [ceph_ansible-{test}]' @@ -92,7 +92,7 @@ - job-template: name: 'ceph-container-prs-ceph_ansible-{test}' id: 'ceph-container-prs-trigger' - node: vagrant&&libvirt&¢os7 + node: vagrant&&libvirt&¢os8 concurrent: true defaults: global display-name: 'ceph-container: Pull Requests [ceph_ansible-{test}]' -- 2.47.3