Merge "add core feature to ofp patch test"

diff --git a/jenkins-scripts/system_type.sh b/jenkins-scripts/system_type.sh
index 75ed826619aeb9436af4b4b0fe9961c791bfef38..8b1e6a54107ba144ac6d397c2343e27327866be3 100755 (executable)
--- a/jenkins-scripts/system_type.sh
+++ b/jenkins-scripts/system_type.sh
@@ -21,7 +21,8 @@ for i in "autorelease,autorelease" \
          "ubuntu-trusty-gbp,ubuntu-docker-ovs" \
          "matrix,matrix" \
          "robot,robot" \
-         "ubuntu-trusty-mininet,mininet-ubuntu"
+         "ubuntu-trusty-mininet,mininet-ubuntu" \
+         "mininet,mininet-ubuntu"
 do set -- $i
     if [[ $HOST == *"$1"* ]]; then
         SYSTEM_TYPE="$2"

diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index 1779581c0238215ab1e76e2e1fc46cd4576feaae..f80bff1890de31a53445a2ded43f17c0a99a08d2 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
@@ -44,14 +44,17 @@
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
+            openstack-image: 'centos7-devstack-mitaka-2c-8g'
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
+            openstack-image: 'centos7-devstack-newton-2c-8g'
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
+            openstack-image: 'centos7-devstack-newton-2c-8g'
 
     openstack-vms: 3
 

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index fb6ebb82708e838902344e74a436f604ba3a15b8..339b6ea76fe23177e422ab913de6959fd6513c5b 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -32,14 +32,17 @@
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
+            openstack-image: 'centos7-devstack-mitaka-2c-8g'
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
+            openstack-image: 'centos7-devstack-newton-2c-8g'
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
+            openstack-image: 'centos7-devstack-newton-2c-8g'
 
     openstack-vms: 4
 

diff --git a/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
index 5214978f36f776ac6746f65f6d2f79ae5ed7542f..b15c82b6176ae8be2dd74d95d8660bf941533eda 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
@@ -30,14 +30,17 @@
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
+            openstack-image: 'centos7-devstack-mitaka-2c-8g'
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
+            openstack-image: 'centos7-devstack-newton-2c-8g'
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
+            openstack-image: 'centos7-devstack-newton-2c-8g'
 
     openstack-vms: 3
 

diff --git a/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
index a49ce6a95ec8b97725759be87afaf144e4044c41..146e10fd22f57783245b690d93c590372edf9ffb 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
@@ -29,14 +29,17 @@
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
+            openstack-image: 'centos7-devstack-mitaka-2c-8g'
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
+            openstack-image: 'centos7-devstack-newton-2c-8g'
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
+            openstack-image: 'centos7-devstack-newton-2c-8g'
 
     openstack-vms: 4