Refactor run-base jobs

Create a parent run job and inherit from it.  This reduces duplicate
'run' parameters, and corrects the omission of run-post from the
eavesdrop job.

Change-Id: Ib2a21b7190bf3611972097d6db545989cd54b3d4
This commit is contained in:
James E. Blair 2018-08-30 10:48:58 -07:00
parent 09b1ff4bc3
commit 6dab882147
1 changed files with 18 additions and 5 deletions

View File

@ -117,8 +117,23 @@
- system-config-zuul-role-integration-bionic
- system-config-zuul-role-integration-debian-stable
- job:
name: system-config-run
description: |
Run the "base" playbook for system-config hosts.
This is a parent job designed to be inherited.
abstract: true
pre-run: playbooks/zuul/run-base-pre.yaml
run: playbooks/zuul/run-base.yaml
post-run: playbooks/zuul/run-base-post.yaml
- job:
name: system-config-run-base
parent: system-config-run
description: |
Run the "base" playbook on each of the node types
currently in use.
nodeset:
nodes:
- name: bridge.openstack.org
@ -136,9 +151,6 @@
ansible_python_interpreter: python2
centos7:
ansible_python_interpreter: python2
pre-run: playbooks/zuul/run-base-pre.yaml
run: playbooks/zuul/run-base.yaml
post-run: playbooks/zuul/run-base-post.yaml
files:
- .zuul.yaml
- playbooks/.*
@ -147,14 +159,15 @@
- job:
name: system-config-run-eavesdrop
parent: system-config-run
description: |
Run the playbook for an eavesdrop server.
nodeset:
nodes:
- name: bridge.openstack.org
label: ubuntu-bionic
- name: eavesdrop01.openstack.org
label: ubuntu-xenial
pre-run: playbooks/zuul/run-base-pre.yaml
run: playbooks/zuul/run-base.yaml
files:
- .zuul.yaml
- playbooks/group_vars/eavesdrop.yaml