Add a job for netvirt SFC CSIT

Change-Id: Ib7d74aca432a56afac898461c1adbdecf8fd9164
Signed-off-by: Alon Kochba <alonko@hpe.com>

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 e7666bd4790edebf380db6337944ac3ee1407c7d..28aa93a88770605bb738451e3b7e7ddf3485dc71 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -58,6 +58,8 @@ elif [ "$plugin_name" == "kuryr-kubernetes" ]; then
     ENABLE_PLUGIN_ARGS="${DEVSTACK_KUBERNETES_PLUGIN_REPO} master" # note: kuryr-kubernetes only exists in master at the moment
 elif [ "$plugin_name" == "neutron-lbaas" ]; then
     ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
+elif [ "$plugin_name" == "networking-sfc" ]; then
+    ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
 else
     echo "Error: Invalid plugin $plugin_name, unsupported"
     continue
@@ -103,6 +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
 EOF
 
 if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 54231f87c699042112555bb2577431b8b872de88..bcc72eca0e7f031611b60038c3d763b209cb7b38 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1038,6 +1038,10 @@
           name: DEVSTACK_LBAAS_PLUGIN_REPO
           default: '{devstack-lbaas-plugin-repo}'
           description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
+          default: '{devstack-networking-sfc-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
       - string:
           name: ODL_ENABLE_L3_FWD
           default: '{odl-enable-l3}'
@@ -1211,6 +1215,10 @@
           name: DEVSTACK_LBAAS_PLUGIN_REPO
           default: '{devstack-lbaas-plugin-repo}'
           description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
+          default: '{devstack-networking-sfc-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
       - string:
           name: ODL_ENABLE_L3_FWD
           default: '{odl-enable-l3}'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index cac427f4071c4dc989f2d97c3bed4fe78c214c53..ae1560b10dffc41453f5d1b69084f0ff987f2cc1 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -120,3 +120,37 @@
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
     security-group-mode: '{sg-mode}'
+
+- project:
+    name: netvirt-csit-extensions-site-openstack-integration
+    jobs:
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'netvirt'
+
+    topology:
+      - 1node:
+          openstack_system_count: 3
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+
+    functionality:
+      - extensions-sfc:
+          schedule: ''
+          enable-openstack-plugins: 'networking-odl,networking-sfc'
+          testplan: '{project}-extensions-sfc.txt'
+
+    stream:
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+
+    openstack:
+      - newton-nodl-v2:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+
+    security-group-mode: 'stateful'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 9bbe150b4ca8dc129e7b458e7c6dd9bb3d55ce6e..5562c8e810876cab2b483661b5eae7ba0b6e8607 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -16,6 +16,7 @@
     networking-l2gw-repo: 'http://git.openstack.org/openstack/networking-l2gw'
     devstack-kubernetes-plugin-repo: 'https://github.com/openstack/kuryr-kubernetes'
     devstack-lbaas-plugin-repo: 'https://github.com/openstack/neutron-lbaas'
+    devstack-networking-sfc-plugin-repo: 'https://github.com/openstack/networking-sfc'
     server-name: 'OpenDaylight'
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
     ipsec-vxlan-tunnels-enabled: 'no'