Merge "[Fullstack] Don't install OVN in the fullstack job"

roles/configure_functional_tests/tasks/main.yaml

@@ -15,6 +15,8 @@
         STACK_USER=stack
         OVS_BRANCH={{ OVS_BRANCH }}
         OVN_BRANCH={{ OVN_BRANCH }}
+        BUILD_OVS_FROM_SOURCE={{ BUILD_OVS_FROM_SOURCE }}
+        INSTALL_OVN={{ INSTALL_OVN }}
         # This is DB USER used in e.g. pgsql db
         DATABASE_USER=openstack_citest
 

tools/configure_for_func_testing.sh

@@ -65,6 +65,7 @@ INSTALL_MYSQL_ONLY=${INSTALL_MYSQL_ONLY:-False}
 # The gate should automatically install dependencies.
 INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE}
 BUILD_OVS_FROM_SOURCE=${BUILD_OVS_FROM_SOURCE:-True}
+INSTALL_OVN=${INSTALL_OVN:-True}
 OVN_BRANCH=${OVN_BRANCH:-main}
 OVS_BRANCH=${OVS_BRANCH:-master}
 
@@ -112,9 +113,12 @@ function _install_base_deps {
         install_package $PACKAGES
 
         source $DEVSTACK_PATH/lib/neutron_plugins/ovn_agent
-        echo_summary "OVN_BRANCH: ${OVN_BRANCH} OVS_BRANCH: ${OVS_BRANCH}"
+        echo_summary "OVS_BRANCH: ${OVS_BRANCH}"
         compile_ovs False /usr /var
-        compile_ovn False /usr /var
+        if [[ "$INSTALL_OVN" == "True" ]]; then
+            echo_summary "OVN_BRANCH: ${OVN_BRANCH}"
+            compile_ovn False /usr /var
+        fi
     else
         PACKAGES=$(get_packages general,neutron,q-agt,q-l3,openvswitch)
         PACKAGES=$(echo $PACKAGES | perl -pe 's|python-(?!dev)[^ ]*||g')

zuul.d/base.yaml

@@ -28,6 +28,8 @@
       - ^roles/.*$
       - ^rally-jobs/.*$
     vars:
+      BUILD_OVS_FROM_SOURCE: True
+      INSTALL_OVN: True
       OVN_BRANCH: v21.06.0
       OVS_BRANCH: v2.16.0
       devstack_services:
@@ -50,6 +52,8 @@
     parent: neutron-functional
     vars:
       tox_envlist: dsvm-fullstack-gate
+      BUILD_OVS_FROM_SOURCE: False
+      INSTALL_OVN: False
       zuul_copy_output:
         # We need to copy directory with logs to have it in job artifacts also,
         # /opt/stack/logs is default logs directory defined in neutron's