Merge "let number of hypervisors be 1 in the case that it's a single node openstack...

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index e0066f3ad9ca27a01e3168107608e8b0e2d3e05b..3f7673a690985937520d8287d85d3b5cac338b5e 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -38,4 +38,4 @@
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
 
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
-    mininet-vms: 0
+    tools_system_count: 0

diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index 8a477ad1839a55737ca6ba89f0d07ec1bde0854e..acbb03867f1e9ebda87d970f8f7857974a35656c 100644 (file)
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -38,4 +38,4 @@
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
 
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
-    mininet-vms: 0
+    tools_system_count: 0

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index e94ed2163e8618203c7d0835a6679fdfee60cf7a..4170987e35dc689a69901a11ba83a583f6837a7c 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -37,4 +37,4 @@
     trigger-jobs: 'alto-distribution-{stream}'
 
     # Don't spin up mininet vms as alto-csit-setup jobs don't need them
-    mininet-vms: 0
+    tools_system_count: 0

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 74c1e9366aab0982eb3bb0b85629e84167b2a5cf..3575d937c5ec8ef024ed4822e5fc6e14c98a1459 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -27,8 +27,8 @@
         - all:
             scope: 'all'
 
-    # No tools system VMs needed in JCloud configuration
-    mininet-vms: 0
+    # No tools system VMs needed in for this job
+    tools_system_count: 0
 
     # Features to install
     install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index ba2edf7ae6726ce1279dbc420e08271a41af4f3c..dad3d01117f339b14f49f9975542441766f06f7e 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -21,7 +21,7 @@
             scope: 'only'
 
     # no mininet required
-    mininet-vms: 0
+    tools_system_count: 0
 
     # Features to install
     install-features: 'odl-daexim-all,odl-netconf-topology,odl-jolokia'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'daexim-merge-{stream}'
-

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index d137efcbbb77d28eb069c4fc8508f64a7c335f48..c7c4bd9a3d17beef46f586398f449e591c182dda 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -26,8 +26,8 @@
             scope: 'all'
 
     # Mininet configuration
-    mininet-image: 'ubuntu-trusty-mininet-ovs-23-2c-2g'
-    mininet-vms: 2
+    tools_system_count: 2
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.3 - 20161110-2310
 
     # Features to install
     install-features: 'odl-genius-ui'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 05a4b4097a496d69b58d962042743b185c1c7fcc..a05c8423142c83982c8d30880f13fdb08053ec90 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -29,8 +29,8 @@
             scope: 'all'
 
     # 3 Ubuntu VMs in JCloud configuration
-    mininet-image: 'ubuntu-trusty-gbp-2c-2g'
-    mininet-vms: 3
+    tools_system_count: 3
+    tools_system_image: Ubuntu 14.04 - gbp - 20161031-0916
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index cbbd85ee637750c1dbfd73a5e06d8a2e3e530aa8..c3ee0b48d7c91db95be6ced46ce21d192074bcd6 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -29,8 +29,8 @@
             scope: 'all'
 
     # 6 Ubuntu VMs in JCloud configuration
-    mininet-image: 'ubuntu-trusty-gbp-2c-2g'
-    mininet-vms: 6
+    tools_system_count: 6
+    tools_system_image: Ubuntu 14.04 - gbp - 20161031-0916
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index 096dfb405b9703070b8c98f91c7bd3ef0ae62b21..8d2e412e4eced86b85346421dd0d4b977ac85df2 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -19,7 +19,7 @@
             scope: 'only'
 
     # Mininet configuration (TOOLS)
-    mininet-vms: 2
+    tools_system_count: 2
 
     # Features to install
     install-features: 'odl-restconf,odl-groupbasedpolicy-sxp-ise-adapter,odl-groupbasedpolicy-ne-location-provider,odl-groupbasedpolicy-ios-xe,odl-sfc-ios-xe-renderer,odl-sxp-controller'

diff --git a/jjb/integration/include-raw-integration-deploy-devstack-testing.sh b/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
deleted file mode 100644 (file)
index 9354338..0000000
--- a/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#@IgnoreInspection BashAddShebang
-# Activate robotframework virtualenv
-# ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
-# script.
-source ${ROBOT_VENV}/bin/activate
-
-echo "Changing the testplan path..."
-cat ${WORKSPACE}/test/csit/testplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > testplan.txt
-cat testplan.txt
-
-SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
-
-echo "Starting Robot test suites ${SUITES} ..."
-
-pybot --removekeywords wuks -e exclude \
--v WORKSPACE:$WORKSPACE -v USER_HOME:$HOME -L TRACE \
--v DEVSTACK_SYSTEM_USER:$USER \
--v DEVSTACK_SYSTEM_IP:$OPENSTACK_CONTROL_NODE_IP \
--v DEFAULT_LINUX_PROMPT:\]\> \
--v OPENSTACK_BRANCH:$OPENSTACK_BRANCH \
--v ODL_VERSION:$ODL_VERSION \
--v DEVSTACK_DEPLOY_PATH:/opt/stack/new/devstack \
--v TEMPEST_REGEX:$TEMPEST_REGEX ${SUITES} || true
-
-scp $OPENSTACK_CONTROL_NODE_IP:/opt/stack/logs/devstacklog.txt $WORKSPACE/
-scp -r $OPENSTACK_CONTROL_NODE_IP:/opt/stack/logs/*karaf* $WORKSPACE/
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
-

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c131cc242cd01e47eb7baccd614aad64f3d796ca..d841cdd7c7fde76b5770054bc9088e0a431eb805 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -69,11 +69,6 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-jclouds-controller-mininet:
-            controller-image: '{controller-image}'
-            controller-vms: 1
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
 
     triggers:
         - integration-trigger-patch-submitted:
@@ -83,8 +78,14 @@
             files: 'csit/suites/{project}/**'
 
     builders:
-        - integration-copy-ssh-keys
-        - integration-cleanup-workspace
+        - integration-infra-stack:
+            stack-template: '{stack-template}'
+            vm_0_count: '1'
+            vm_0_flavor: '{odl_system_flavor}'
+            vm_0_image: '{odl_system_image}'
+            vm_1_count: '{tools_system_count}'
+            vm_1_flavor: '{tools_system_flavor}'
+            vm_1_image: '{tools_system_image}'
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -155,19 +156,20 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-jclouds-controller-mininet:
-            controller-image: '{controller-image}'
-            controller-vms: 1
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
 
     triggers:
         - integration-csit-{install}:
             jobs: '{trigger-jobs}'
 
     builders:
-        - integration-copy-ssh-keys
-        - integration-cleanup-workspace
+        - integration-infra-stack:
+            stack-template: '{stack-template}'
+            vm_0_count: '1'
+            vm_0_flavor: '{odl_system_flavor}'
+            vm_0_image: '{odl_system_image}'
+            vm_1_count: '{tools_system_count}'
+            vm_1_flavor: '{tools_system_flavor}'
+            vm_1_image: '{tools_system_image}'
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index 7874dd4083d89d8241c0fbd98e032e6d2858c29d..773fb327a9414f0009e13ada41ee4fa525504345 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -28,7 +28,7 @@
         - all:
             scope: 'all'
 
-    mininet-image: 'ubuntu-trusty-mininet-ovs-23-2c-2g'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.3 - 20161110-2310
 
     # Features to install
     install-features: 'odl-lacp-ui'

diff --git a/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
index b15c82b6176ae8be2dd74d95d8660bf941533eda..7853df99ad7ce2f94668b2f33da838511bc3376c 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
@@ -30,19 +30,19 @@
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
-            openstack-image: 'centos7-devstack-mitaka-2c-8g'
+            openstack_system_image: CentOS 7 - devstack - mitaka - 20170106-2237
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
-            openstack-image: 'centos7-devstack-newton-2c-8g'
+            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
         - 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_system_image: CentOS 7 - devstack - newton - 20170106-2237
 
-    openstack-vms: 3
+    openstack_system_count: 3
 
     install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 

diff --git a/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
index a7961e57179f0fa8909016909d51e54974b7007c..432d04d2bfd02df2528d21b829368a55ca23f2b7 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
@@ -29,17 +29,17 @@
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack - mitaka - 20170106-2237'
+            openstack_system_image: CentOS 7 - devstack - mitaka - 20170106-2237
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
-            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
 
     openstack_system_count: 4
 

diff --git a/jjb/netvirt/netvirt-legacy-csit.yaml b/jjb/netvirt/netvirt-legacy-csit.yaml
index 9344def1b103feab0485e214ad99bd65d91d4186..91e12f4b97f413e2c9a178df352dd617b046e3d8 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit.yaml
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Mininet configuration
-    mininet-vms: 2
+    tools_system_count: 2
 
     # Features to install
     install-features: 'odl-ovsdb-openstack'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
index a5cc21f91a2c0c1f1942bb1720a1e7568165fb0f..8d7e55391e129b4793f301d33037287bd7ac161e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
@@ -30,7 +30,7 @@
     robot-options: '-v flow_update_time:30s'
 
     # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
index 87398148d3ae16955e98c1b419102f367c650b78..a62e772c14dc70510c5ed5d657e7c6ecf4f5c180 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
@@ -28,7 +28,7 @@
     robot-options: ''
 
     # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 08134d3d6f85757a769488e912120c7bed620587..995df97d4d06a86ab193dc9abea90421d5430f01 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -32,7 +32,7 @@
     robot-options: ''
 
     # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index de2506766b73d514b459579011f1acae637e3e1a..d37334e568572e1d357999ce093d9182a9da5253 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -29,7 +29,7 @@
     robot-options: ''
 
     # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 3475cafc70b758176042cec9e43e36de7a3422f3..8e3aa677b1311a9995b293439eaf643ee7dbd892 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -30,7 +30,7 @@
     robot-options: '-v TEST_LENGTH:23h'
 
     # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index be35738caf915ae9e145e78c4caaa4e89bf39a96..d23e95baa400bf879ebe07b51c70d6239ec4145f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -29,7 +29,7 @@
     robot-options: ''
 
     # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 5aa9a8af99ecf9cb58fc3be153e4daf7cc77f09d..cef56dea87ed40bba38db02c45456911ad89ab0a 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -28,7 +28,7 @@
             scope: 'all'
 
     # Mininet configuration
-    mininet-vms: 2
+    tools_system_count: 2
 
     # Features to install
     install-features: 'odl-ovsdb-southbound-impl-rest'

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index f92da132f9e7cb02b279c90b8a63fe5744c88220..6448505203a34d5bc8e0ac6182a4dcaaeabf895f 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Mininet configuration
-    mininet-vms: 2
+    tools_system_count: 2
 
     # Features to install
     install-features: 'odl-unimgr-ui'

diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
index c479fac5a2950ed97b9872e751e2ac39c7731b22..155f2747fb275b74f76c59c8aea30baa0934a89f 100644 (file)
--- a/jjb/unimgr/unimgr-csit-legato.yaml
+++ b/jjb/unimgr/unimgr-csit-legato.yaml
@@ -26,7 +26,7 @@
             scope: 'all'
 
     # Mininet configuration
-    mininet-vms: 2
+    tools_system_count: 2
 
     # Features to install
     install-features: 'odl-unimgr-ui,odl-unimgr-netvirt'
@@ -35,7 +35,7 @@
     robot-options: ''
 
     # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'ovsdb-distribution-{stream},unimgr-distribution-{stream},netvirt-distribution-{stream},genius-distribution-{stream}'

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 32c927e7ac71f370cdcb18711bc445828c1f3dce..b90579c7872180804f81cf595e2861cd96616308 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -15,11 +15,11 @@
         - carbon:
             branch: 'master'
             jre: 'openjdk8'
-            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+            tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
-            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+            tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index 3cceeab231fc6f44d6a326493918d5721f714a36..ca9bd6637cd77e7031180c4aef5542754d223f2a 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -21,7 +21,7 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-            mininet-image: 'ubuntu-trusty-mininet-2c-2g'
+            tools_system_image: Ubuntu 14.04 - mininet - 20161031-0803
 
     install:
         - only:
@@ -35,7 +35,7 @@
     # Robot custom options
     robot-options: ''
 
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'