Merge "Make gentoo multinode job nv"
This commit is contained in:
commit
8df1e02752
@ -55,7 +55,7 @@ inventory in order to work:
|
||||
:default: false
|
||||
|
||||
When ``bridge_configure_address`` is ``true``, whether or not to set up
|
||||
firewall rules in order to allow traffic to flow freely within the bridge
|
||||
firewall rules to allow traffic freely within the bridge
|
||||
subnet (``bridge_address_prefix``.0/``bridge_address_subnet``).
|
||||
|
||||
.. zuul:rolevar:: bridge_address_prefix
|
||||
|
@ -48,6 +48,11 @@ NON_VOTING = [
|
||||
'opensuse-tumbleweed',
|
||||
]
|
||||
|
||||
# Insert a job to make that single job non-voting
|
||||
NON_VOTING_JOBS = [
|
||||
'zuul-jobs-test-multinode-roles-gentoo-17-0-systemd',
|
||||
]
|
||||
|
||||
|
||||
def get_nodeset(platform, multinode):
|
||||
d = CommentedMap()
|
||||
@ -94,6 +99,8 @@ def handle_file(fn):
|
||||
voting = False if platform in NON_VOTING else True
|
||||
ojob = CommentedMap()
|
||||
ojob['name'] = job['name'] + '-' + platform
|
||||
if ojob['name'] in NON_VOTING_JOBS:
|
||||
voting = False
|
||||
if not voting:
|
||||
ojob['name'] += '-nv'
|
||||
ojob['voting'] = False
|
||||
|
@ -514,7 +514,8 @@
|
||||
- secondary
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
|
||||
name: zuul-jobs-test-multinode-roles-gentoo-17-0-systemd-nv
|
||||
voting: false
|
||||
description: Tests multinode setup roles on gentoo-17-0-systemd
|
||||
parent: zuul-jobs-test-multinode-roles
|
||||
tags: auto-generated
|
||||
@ -734,7 +735,7 @@
|
||||
- zuul-jobs-test-multinode-roles-centos-8
|
||||
- zuul-jobs-test-multinode-roles-debian-stretch
|
||||
- zuul-jobs-test-multinode-roles-fedora-31
|
||||
- zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
|
||||
- zuul-jobs-test-multinode-roles-gentoo-17-0-systemd-nv
|
||||
- zuul-jobs-test-multinode-roles-opensuse-15
|
||||
- zuul-jobs-test-multinode-roles-opensuse-tumbleweed-nv
|
||||
- zuul-jobs-test-multinode-roles-ubuntu-bionic
|
||||
@ -780,7 +781,6 @@
|
||||
- zuul-jobs-test-multinode-roles-centos-8
|
||||
- zuul-jobs-test-multinode-roles-debian-stretch
|
||||
- zuul-jobs-test-multinode-roles-fedora-31
|
||||
- zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
|
||||
- zuul-jobs-test-multinode-roles-opensuse-15
|
||||
- zuul-jobs-test-multinode-roles-ubuntu-bionic
|
||||
- zuul-jobs-test-multinode-roles-ubuntu-xenial
|
||||
|
Loading…
Reference in New Issue
Block a user