From 2478dab84159bb0b3e2beb57d652cf15c9bfe322 Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Tue, 9 Feb 2021 14:58:54 +0000 Subject: [PATCH] [OVN] Set OVN_BUILD_FROM_SOURCE=True for ovs-master jobs The OVN_BUILD_FROM_SOURCE was introduced by a patch in DevStack [0] which allows for stacking OVN using packages instead of compiling it from source (by default that flag is False). Now the jobs compiling OVN (master ones) should include this flag. Also since the logs are on different paths depending on how OVN is installed, we are telling zuul to collect it properly for the compiled version (this inconsistency is something that perhaps we should fix in DevStack itself). [0] https://review.opendev.org/c/openstack/devstack/+/763402 Change-Id: I46654762921aeec7603800005681239cdf202632 Signed-off-by: Lucas Alvares Gomes --- zuul.d/tempest-multinode.yaml | 7 +++++++ zuul.d/tempest-singlenode.yaml | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 00a339d13a7..507a21e2893 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -386,11 +386,18 @@ ((^neutron_tempest_plugin.api)|\ (^neutron_tempest_plugin.scenario)|\ (tempest.(api|scenario|thirdparty))).*$" + zuul_copy_output: + '{{ devstack_base_dir }}/data/ovs': 'logs' + '{{ devstack_base_dir }}/data/ovn': 'logs' + '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs' + '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs' devstack_localrc: + OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: master OVS_BRANCH: master group-vars: subnode: devstack_localrc: + OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: master OVS_BRANCH: master diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 70f68e9b9ae..eb215e03f72 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -473,7 +473,13 @@ parent: neutron-ovn-base nodeset: devstack-single-node-fedora-latest vars: + zuul_copy_output: + '{{ devstack_base_dir }}/data/ovs': 'logs' + '{{ devstack_base_dir }}/data/ovn': 'logs' + '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs' + '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs' devstack_localrc: + OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: master OVS_BRANCH: master devstack_services: