From 783e1c8a0679497a636a22f24c6c95bc66ee9511 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 6 Jul 2017 19:42:52 +0200 Subject: [PATCH] mitaka-eol: Remove unused charm trusty jobs charm repos do not have stable/mitaka branches - and neither have a special branch role to run trusty jobs on other branches. Thus remove all trusty jobs for them, they are completely unused. Change-Id: I1b772a926673de5dfd98678fcdcb64ea10ffe8c1 --- jenkins/jobs/charm-jobs.yaml | 12 +++--------- zuul/layout.yaml | 30 ++++++++++-------------------- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/jenkins/jobs/charm-jobs.yaml b/jenkins/jobs/charm-jobs.yaml index cc59672c22..c4dac65844 100644 --- a/jenkins/jobs/charm-jobs.yaml +++ b/jenkins/jobs/charm-jobs.yaml @@ -1,8 +1,6 @@ - job-group: name: charm-layer-jobs - node: - - ubuntu-trusty - - ubuntu-xenial + node: ubuntu-xenial jobs: - 'gate-{name}-pep8-{node}' - 'gate-{name}-tox-{envlist}-{node}': @@ -10,9 +8,7 @@ - job-group: name: python-charm-jobs - node: - - ubuntu-trusty - - ubuntu-xenial + node: ubuntu-xenial jobs: - 'gate-{name}-pep8-{node}' - 'gate-{name}-python27-{node}' @@ -22,8 +18,6 @@ - job-group: name: python-charm-interface-jobs - node: - - ubuntu-trusty - - ubuntu-xenial + node: ubuntu-xenial jobs: - 'gate-{name}-pep8-{node}' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index df64307fe9..2d18a15b49 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -411,37 +411,27 @@ project-templates: - name: python-charm-jobs check: - - 'gate-{name}-pep8-ubuntu-trusty' - - 'gate-{name}-python27-ubuntu-trusty' - - 'gate-{name}-pep8-ubuntu-xenial' - - 'gate-{name}-python27-ubuntu-xenial' + - gate-{name}-pep8-ubuntu-xenial + - gate-{name}-python27-ubuntu-xenial gate: - - 'gate-{name}-pep8-ubuntu-trusty' - - 'gate-{name}-python27-ubuntu-trusty' - - 'gate-{name}-pep8-ubuntu-xenial' - - 'gate-{name}-python27-ubuntu-xenial' + - gate-{name}-pep8-ubuntu-xenial + - gate-{name}-python27-ubuntu-xenial post: - '{name}-branch-tarball' - name: python-charm-interface-jobs check: - - 'gate-{name}-pep8-ubuntu-trusty' - - 'gate-{name}-pep8-ubuntu-xenial' + - gate-{name}-pep8-ubuntu-xenial gate: - - 'gate-{name}-pep8-ubuntu-trusty' - - 'gate-{name}-pep8-ubuntu-xenial' + - gate-{name}-pep8-ubuntu-xenial - name: python-charm-layer-jobs check: - - 'gate-{name}-pep8-ubuntu-trusty' - - 'gate-{name}-pep8-ubuntu-xenial' - - 'gate-{name}-tox-build-ubuntu-trusty' - - 'gate-{name}-tox-build-ubuntu-xenial' + - gate-{name}-pep8-ubuntu-xenial + - gate-{name}-tox-build-ubuntu-xenial gate: - - 'gate-{name}-pep8-ubuntu-trusty' - - 'gate-{name}-pep8-ubuntu-xenial' - - 'gate-{name}-tox-build-ubuntu-trusty' - - 'gate-{name}-tox-build-ubuntu-xenial' + - gate-{name}-pep8-ubuntu-xenial + - gate-{name}-tox-build-ubuntu-xenial - name: periodic-jobs-with-oslo-master periodic: