From 2af5efcbf71226571d7b4923210180fe35d79fd8 Mon Sep 17 00:00:00 2001 From: Rafael Folco Date: Wed, 21 Nov 2018 14:25:06 -0200 Subject: [PATCH] Deprecate tripleo stable/{newton,ocata} jobs Non-containerized jobs were running for stable/newton and stable/ocata branches and are no longer supported. - Move deprecated jobs into a separate zuul config file - Reparent deprecated jobs to tripleo-ci-deprecated - Add a playbook with deprecated warning - Disable jobs with 'branches: none/deprecated' filter - Remove/disable non-containerized scenario jobs from layout - Add noop to templates with non-contrainerized jobs only * tripleo-multinode-baremetal-minimal template * tripleo-multinode-baremetal-full template - Rename (create a copy for) scen006 and scen009 with a '-container' suffix as these are containerized As tripleo-ci repo is not branched, all the projects that have these jobs in their zuul config (including all branches) will be affected. Therefore, a cleanup is required to deprecate jobs before removing them from zuul config. A follow-up change will *delete* the definition of deprecated jobs from zuul config, Story: https://tree.taiga.io/project/tripleo-ci-board/issue/372 Change-Id: I23df3518820d39f32d1daded33776d757c144217 --- playbooks/deprecated/README.rst | 2 + playbooks/deprecated/pre.yaml | 14 +++++ zuul.d/deprecated-jobs.yaml | 92 ++++++++++++++++++++++++++++++ zuul.d/layout.yaml | 24 +------- zuul.d/multinode-jobs.yaml | 99 +++++---------------------------- 5 files changed, 126 insertions(+), 105 deletions(-) create mode 100644 playbooks/deprecated/README.rst create mode 100644 playbooks/deprecated/pre.yaml create mode 100644 zuul.d/deprecated-jobs.yaml diff --git a/playbooks/deprecated/README.rst b/playbooks/deprecated/README.rst new file mode 100644 index 000000000..15865ee3d --- /dev/null +++ b/playbooks/deprecated/README.rst @@ -0,0 +1,2 @@ +This playbook prints a deprecation warning message to inform +that the job is no longer supported and should not be in use. diff --git a/playbooks/deprecated/pre.yaml b/playbooks/deprecated/pre.yaml new file mode 100644 index 000000000..ae2d587d4 --- /dev/null +++ b/playbooks/deprecated/pre.yaml @@ -0,0 +1,14 @@ +- name: Deprecation warning + hosts: all + gather_facts: no + tasks: + - name: Warn that the job is deprecated + debug: + msg: | + -------------------------------------------------------- + D E P R E C A T E D J O B W A R N I N G + -------------------------------------------------------- + This job is deprecated and is no longer supported. + Please DO NOT use this job in your Zuul config. + + Refer to #tripleo irc channel on Freenode for more info. diff --git a/zuul.d/deprecated-jobs.yaml b/zuul.d/deprecated-jobs.yaml new file mode 100644 index 000000000..4ad9fe408 --- /dev/null +++ b/zuul.d/deprecated-jobs.yaml @@ -0,0 +1,92 @@ +--- +# zuul.d/deprecated-jobs.yaml +# Zuul layout for TripleO deprecated jobs. +# It contains all the deprecated jobs that should be removed from Zuul. + +- job: + name: tripleo-ci-deprecated + description: | + Deprecated TripleO Job + Job no longer supported that should be removed from Zuul config. + parent: tripleo-ci-base-multinode + pre-run: playbooks/deprecated/pre.yaml + +#TODO(rfolco): non-containeirized (nc) scenarios are no longer supported. +# These (nc) scenario jobs ran until ocata release and should be removed +# or replaced by containerized scenario jobs *-container. +- job: + name: tripleo-ci-centos-7-scenario001-multinode-oooq + parent: tripleo-ci-deprecated + branches: none/deprecated + vars: + nodes: 1ctlr + featureset: '005' + +- job: + name: tripleo-ci-centos-7-scenario002-multinode-oooq + parent: tripleo-ci-deprecated + branches: none/deprecated + vars: + nodes: 1ctlr + featureset: '006' + +- job: + name: tripleo-ci-centos-7-scenario003-multinode-oooq + parent: tripleo-ci-deprecated + branches: none/deprecated + vars: + nodes: 1ctlr + featureset: '007' + +- job: + name: tripleo-ci-centos-7-scenario004-multinode-oooq + parent: tripleo-ci-deprecated + branches: none/deprecated + vars: + nodes: 1ctlr + featureset: '008' + +- job: + name: tripleo-ci-centos-7-scenario007-multinode-oooq + parent: tripleo-ci-deprecated + branches: none/deprecated + vars: + nodes: 1ctlr + featureset: '028' + +- job: + name: tripleo-ci-centos-7-scenario008-multinode-oooq + parent: tripleo-ci-deprecated + voting: false + branches: none/deprecated + vars: + nodes: 1ctlr + featureset: '031' + +- job: + name: tripleo-ci-centos-7-nonha-multinode-oooq + parent: tripleo-ci-deprecated + branches: none/deprecated + vars: + nodes: 1ctlr + featureset: '004' + +#TODO(rfolco): scen00{6,9} are containeirized, remove this when +# all projects using them rename to the *-container (dup) jobs +- job: + name: tripleo-ci-centos-7-scenario006-multinode-oooq + parent: tripleo-ci-deprecated + voting: false + branches: ^(?!stable/(newton|ocata)).*$ + vars: + nodes: 1ctlr + featureset: '026' + +- job: + name: tripleo-ci-centos-7-scenario009-multinode-oooq + parent: tripleo-ci-deprecated + voting: false + branches: ^(?!stable/(newton|ocata)).*$ + vars: + nodes: 1ctlr + featureset: '033' diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index a129315e7..ec8fd7b8a 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -31,27 +31,6 @@ - tripleo-buildimage-overcloud-hardened-full-centos-7: files: - ^playbooks/tripleo-buildimage/.*$ - - tripleo-ci-centos-7-scenario001-multinode-oooq: - files: - - ^playbooks/tripleo-ci/.*$ - - tripleo-ci-centos-7-scenario002-multinode-oooq: - files: - - ^playbooks/tripleo-ci/.*$ - - tripleo-ci-centos-7-scenario002-multinode-oooq: - files: - - ^playbooks/tripleo-ci/.*$ - - tripleo-ci-centos-7-scenario003-multinode-oooq: - files: - - ^playbooks/tripleo-ci/.*$ - - tripleo-ci-centos-7-scenario004-multinode-oooq: - files: - - ^playbooks/tripleo-ci/.*$ - - tripleo-ci-centos-7-scenario007-multinode-oooq: - files: - - ^playbooks/tripleo-ci/.*$ - - tripleo-ci-centos-7-scenario009-multinode-oooq: - files: - - ^playbooks/tripleo-ci/.*$ - tripleo-ci-centos-7-scenario001-multinode-oooq-container: files: - ^playbooks/tripleo-ci/.*$ @@ -70,6 +49,9 @@ - tripleo-ci-centos-7-scenario008-multinode-oooq-container: files: - ^playbooks/tripleo-ci/.*$ + - tripleo-ci-centos-7-scenario009-multinode-oooq-container: + files: + - ^playbooks/tripleo-ci/.*$ gate: queue: tripleo jobs: diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml index 66340d57d..c2fe99404 100644 --- a/zuul.d/multinode-jobs.yaml +++ b/zuul.d/multinode-jobs.yaml @@ -7,11 +7,11 @@ name: tripleo-multinode-baremetal-minimal check: jobs: - - tripleo-ci-centos-7-nonha-multinode-oooq + - noop gate: queue: tripleo jobs: - - tripleo-ci-centos-7-nonha-multinode-oooq + - noop - project-template: name: tripleo-multinode-container-minimal @@ -24,7 +24,6 @@ - tripleo-ci-centos-7-standalone - tripleo-ci-fedora-28-standalone - tripleo-ci-centos-7-standalone-upgrade - gate: queue: tripleo jobs: @@ -32,6 +31,16 @@ - tripleo-ci-centos-7-standalone - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates +- project-template: + name: tripleo-multinode-baremetal-full + check: + jobs: + - noop + gate: + queue: tripleo + jobs: + - noop + - project-template: name: tripleo-multinode-container-full check: @@ -57,31 +66,11 @@ - tripleo-ci-centos-7-standalone - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates -- project-template: - name: tripleo-multinode-baremetal-full - check: - jobs: - - tripleo-ci-centos-7-nonha-multinode-oooq - - tripleo-ci-centos-7-scenario001-multinode-oooq - - tripleo-ci-centos-7-scenario002-multinode-oooq - - tripleo-ci-centos-7-scenario003-multinode-oooq - - tripleo-ci-centos-7-scenario004-multinode-oooq - - tripleo-ci-centos-7-scenario007-multinode-oooq - - tripleo-ci-centos-7-scenario009-multinode-oooq - gate: - queue: tripleo - jobs: - - tripleo-ci-centos-7-nonha-multinode-oooq - - tripleo-ci-centos-7-scenario001-multinode-oooq - - tripleo-ci-centos-7-scenario002-multinode-oooq - - tripleo-ci-centos-7-scenario003-multinode-oooq - - tripleo-ci-centos-7-scenario004-multinode-oooq - - project-template: name: tripleo-multinode-experimental experimental: jobs: - - tripleo-ci-centos-7-scenario006-multinode-oooq + - tripleo-ci-centos-7-scenario006-multinode-oooq-container - tripleo-ci-centos-7-scenario010-multinode-oooq-container - tripleo-ci-centos-7-scenario011-multinode-oooq-container @@ -150,23 +139,6 @@ playbooks: - multinode.yml - -- job: - name: tripleo-ci-centos-7-nonha-multinode-oooq - parent: tripleo-ci-base-multinode - branches: ^stable/(newton|ocata).*$ - vars: - nodes: 1ctlr - featureset: '004' - -- job: - name: tripleo-ci-centos-7-scenario001-multinode-oooq - parent: tripleo-ci-base-multinode - branches: ^stable/(newton|ocata).*$ - vars: - nodes: 1ctlr - featureset: '005' - - job: name: tripleo-ci-centos-7-scenario001-multinode-oooq-container parent: tripleo-ci-base-multinode @@ -176,14 +148,6 @@ nodes: 1ctlr featureset: '016' -- job: - name: tripleo-ci-centos-7-scenario002-multinode-oooq - parent: tripleo-ci-base-multinode - branches: ^stable/(newton|ocata).*$ - vars: - nodes: 1ctlr - featureset: '006' - - job: name: tripleo-ci-centos-7-scenario002-multinode-oooq-container parent: tripleo-ci-base-multinode @@ -201,14 +165,6 @@ nodes: 1ctlr featureset: '055' -- job: - name: tripleo-ci-centos-7-scenario003-multinode-oooq - parent: tripleo-ci-base-multinode - branches: ^stable/ocata.*$ - vars: - nodes: 1ctlr - featureset: '007' - - job: name: tripleo-ci-centos-7-scenario003-multinode-oooq-container parent: tripleo-ci-base-multinode @@ -218,14 +174,6 @@ nodes: 1ctlr featureset: '018' -- job: - name: tripleo-ci-centos-7-scenario004-multinode-oooq - parent: tripleo-ci-base-multinode - branches: ^stable/ocata.*$ - vars: - nodes: 1ctlr - featureset: '008' - - job: name: tripleo-ci-centos-7-scenario004-multinode-oooq-container parent: tripleo-ci-base-multinode @@ -236,7 +184,7 @@ featureset: '019' - job: - name: tripleo-ci-centos-7-scenario006-multinode-oooq + name: tripleo-ci-centos-7-scenario006-multinode-oooq-container parent: tripleo-ci-base-multinode voting: false branches: ^(?!stable/(newton|ocata)).*$ @@ -244,14 +192,6 @@ nodes: 1ctlr featureset: '026' -- job: - name: tripleo-ci-centos-7-scenario007-multinode-oooq - parent: tripleo-ci-base-multinode - branches: ^stable/pike.*$ - vars: - nodes: 1ctlr - featureset: '028' - - job: name: tripleo-ci-centos-7-scenario007-multinode-oooq-container parent: tripleo-ci-base-multinode @@ -271,16 +211,7 @@ featureset: '031' - job: - name: tripleo-ci-centos-7-scenario008-multinode-oooq - parent: tripleo-ci-base-multinode - voting: false - branches: ^(?!stable/(newton|ocata|pike|queens)).*$ - vars: - nodes: 1ctlr - featureset: '031' - -- job: - name: tripleo-ci-centos-7-scenario009-multinode-oooq + name: tripleo-ci-centos-7-scenario009-multinode-oooq-container parent: tripleo-ci-base-multinode voting: false branches: ^(?!stable/(newton|ocata)).*$