From 536e1f7f8c764318053371af66c5ba1fa8d4fa37 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Sat, 16 May 2020 16:29:46 +0100 Subject: [PATCH] Make gentoo multinode job nv Gentoo multinode job is consistently failing. To disable only this job with current test framework, we need to adapt the test framework, so that disabling of specific jobs is possible. Also includes minor documentation fix which triggers affected jobs. Co-Authored-By: Andreas Jaeger Change-Id: Ida9d1714f1f6c3f4fbee469ef940147f969d9466 --- roles/multi-node-bridge/README.rst | 2 +- tools/update-test-platforms.py | 7 +++++++ zuul-tests.d/general-roles-jobs.yaml | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/roles/multi-node-bridge/README.rst b/roles/multi-node-bridge/README.rst index aa1b0c35a..49ee94c68 100644 --- a/roles/multi-node-bridge/README.rst +++ b/roles/multi-node-bridge/README.rst @@ -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 diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py index 75ba2c877..dda03379d 100755 --- a/tools/update-test-platforms.py +++ b/tools/update-test-platforms.py @@ -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 diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index 8d68de02b..0311ca28a 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -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