Merge "Install odl-sfc-genius for openstack-sfc CSIT"

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index 00545f39260cac4696b7a49df22d1e2b678a86b6..a1f70a0fa74dbe55e7e55d47a43bbd7b4b0b1f77 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -105,8 +105,8 @@ LIBVIRT_TYPE=qemu
 ODL_MGR_IP=${MGRIP}
 
 NEUTRON_LBAAS_SERVICE_PROVIDERV2=${LBAAS_SERVICE_PROVIDER} # Only relevant if neutron-lbaas plugin is enabled
-NEUTRON_SFC_DRIVERS=odl_v2 # Only relevant if networking-sfc plugin is enabled
-NEUTRON_FLOWCLASSIFIER_DRIVERS=odl_v2 # Only relevant if networking-sfc plugin is enabled
+NEUTRON_SFC_DRIVERS=${ODL_SFC_DRIVER} # Only relevant if networking-sfc plugin is enabled
+NEUTRON_FLOWCLASSIFIER_DRIVERS=${ODL_SFC_DRIVER} # Only relevant if networking-sfc plugin is enabled
 EOF
 
 if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 187dd76cbfa93cbae4a8226d3cfdf755cfdc325d..e9487cf1fdb39946ebc5c2b91a8c7f783698e31a 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1099,6 +1099,10 @@
           default: '{lbaas-service-provider}'
           description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
           neutron-lbaas'
+      - string:
+          name: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -1276,6 +1280,10 @@
           name: NUM_OPENSTACK_SITES
           default: '{num-openstack-sites}'
           description: 'Number of openstack sites'
+      - string:
+          name: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
 
     scm:
       - integration-gerrit-scm:

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index b45507557b2e7fbb8f66bafc92c82592abd15a72..633b13d760fe6556e8f8342bb28495985b8c7e44 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -136,7 +136,7 @@
           openstack_system_count: 3
           odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          install-features: 'odl-netvirt-sfc'
 
     functionality:
       - extensions-sfc:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 8c36514b3348dde6efb5f1cb2b05e548ea66bc51..bd300d716b27fae952c26594e1e0a68c3a709e91 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -36,6 +36,7 @@
     public-physical-network: 'physnet1'
     security-group-mode: 'none'
     tenant-network-type: 'vxlan'
+    odl-sfc-driver: 'odl'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''