Remove dup config on tripleo-ci jobs

- fs037 has dup config as pre-run, required-projects and
files filtering.
- pre-run and required-projects are already set in the base
parent job 'tripleo-ci-base'.
- pre-run is being called twice (from the top leaf job and from
its parent).
- post-run is common to all jobs that parents to tripleo-ci-base,
move it to the parent.

Change-Id: I0bc6a7f0422caf0b4b8c813510025490c0a2a087
Closes-Bug: #1785288
This commit is contained in:
Rafael Folco 2018-08-03 16:45:34 -03:00
parent 055ece4ed4
commit 1a3ba5bd9f
4 changed files with 2 additions and 48 deletions

View File

@ -30,6 +30,7 @@
- playbooks/multinode-networking/pre.yaml
- playbooks/openstack-zuul-jobs/legacy/pre.yaml
run: playbooks/tripleo-ci/run-v3.yaml
post-run: playbooks/tripleo-ci/post.yaml
irrelevant-files:
- ^.*\.md$
- ^.*\.rst$

View File

@ -96,7 +96,6 @@
- job:
name: tripleo-ci-centos-7-3nodes-multinode
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
voting: false
nodeset: three-centos-7-nodes
@ -110,7 +109,6 @@
- job:
name: tripleo-ci-centos-7-containers-multinode
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^(?!stable/(newton|ocata)).*$
vars:
@ -122,7 +120,6 @@
- job:
name: tripleo-ci-centos-7-containers-multinode-queens
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: master
vars:
@ -135,7 +132,6 @@
- job:
name: tripleo-ci-centos-7-containers-multinode-pike
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: master
vars:
@ -148,7 +144,6 @@
- job:
name: tripleo-ci-centos-7-nonha-multinode-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^stable/(newton|ocata).*$
vars:
@ -160,7 +155,6 @@
- job:
name: tripleo-ci-centos-7-scenario001-multinode-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^stable/(newton|ocata).*$
vars:
@ -172,7 +166,6 @@
- job:
name: tripleo-ci-centos-7-scenario001-multinode-oooq-container
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^(?!stable/(newton|ocata)).*$
vars:
@ -184,7 +177,6 @@
- job:
name: tripleo-ci-centos-7-scenario002-multinode-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^stable/(newton|ocata).*$
vars:
@ -196,7 +188,6 @@
- job:
name: tripleo-ci-centos-7-scenario002-multinode-oooq-container
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^(?!stable/(newton|ocata)).*$
vars:
@ -208,7 +199,6 @@
- job:
name: tripleo-ci-centos-7-scenario002-multinode-oooq-container-refstack
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^(?!stable/(newton)).*$
vars:
@ -220,7 +210,6 @@
- job:
name: tripleo-ci-centos-7-scenario003-multinode-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^stable/ocata.*$
vars:
@ -232,7 +221,6 @@
- job:
name: tripleo-ci-centos-7-scenario003-multinode-oooq-container
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^(?!stable/(newton|ocata)).*$
vars:
@ -244,7 +232,6 @@
- job:
name: tripleo-ci-centos-7-scenario004-multinode-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^stable/ocata.*$
vars:
@ -256,7 +243,6 @@
- job:
name: tripleo-ci-centos-7-scenario004-multinode-oooq-container
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^(?!stable/(newton|ocata)).*$
vars:
@ -268,7 +254,6 @@
- job:
name: tripleo-ci-centos-7-scenario006-multinode-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
voting: false
branches: ^(?!stable/(newton|ocata)).*$
@ -281,7 +266,6 @@
- job:
name: tripleo-ci-centos-7-scenario007-multinode-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^stable/pike.*$
vars:
@ -293,7 +277,6 @@
- job:
name: tripleo-ci-centos-7-scenario007-multinode-oooq-container
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:
@ -305,7 +288,6 @@
- job:
name: tripleo-ci-centos-7-scenario008-multinode-oooq-container
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
voting: false
branches: ^(?!stable/(newton|ocata|pike)).*$
@ -318,7 +300,6 @@
- job:
name: tripleo-ci-centos-7-scenario008-multinode-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
voting: false
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
@ -331,7 +312,6 @@
- job:
name: tripleo-ci-centos-7-scenario009-multinode-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
voting: false
branches: ^(?!stable/(newton|ocata)).*$
@ -344,7 +324,6 @@
- job:
name: tripleo-ci-centos-7-scenario010-multinode-oooq-container
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
voting: false
branches: ^(?!stable/(newton|ocata|pike)).*$
@ -359,8 +338,6 @@
description: |
Basic tripleo update job, this is not an upgrade job.
parent: tripleo-ci-base
pre-run: playbooks/nodepool-provider/pre.yaml
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
voting: true
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
@ -372,28 +349,10 @@
# Note (dmsimard): This enforces a minimum TTL for DNS records, see
# https://review.openstack.org/#/c/523178/ for context
unbound_cache_min_ttl: 900
required-projects:
- openstack-infra/tripleo-ci
- openstack/tripleo-quickstart
- openstack/tripleo-quickstart-extras
- openstack/tripleo-upgrade
irrelevant-files:
- ^.*\.md$
- ^.*\.rst$
- ^doc/.*$
- ^etc/.*$
- ^metadata.json$
- ^releasenotes/.*$
- ^requirements.txt$
- ^test-requirements.txt$
- ^spec/.*$
- ^Puppetfile.*$
- tox.ini
- ^setup.*$
- job:
name: tripleo-ci-centos-7-scenario011-multinode-oooq-container
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
voting: false
branches: ^(?!stable/(newton|ocata)).*$
@ -406,7 +365,6 @@
- job:
name: tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
voting: false
branches: ^(?!stable/(newton|ocata)).*$

View File

@ -6,7 +6,6 @@
- job:
name: tripleo-ci-centos-7-standalone
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
nodeset: single-centos-7-node
voting: false

View File

@ -21,7 +21,6 @@
- job:
name: tripleo-ci-centos-7-undercloud-containers
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
@ -33,7 +32,6 @@
- job:
name: tripleo-ci-centos-7-undercloud-oooq
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
nodeset: single-centos-7-node
vars:
@ -44,7 +42,6 @@
- job:
name: tripleo-ci-centos-7-undercloud-upgrades
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata)).*$
@ -56,7 +53,6 @@
- job:
name: tripleo-ci-centos-7-containerized-undercloud-upgrades
parent: tripleo-ci-base
post-run: playbooks/tripleo-ci/post.yaml
timeout: 10800
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata|pike|queens)).*$