Merge "Update CentOS 7 devstack Ocata image"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 1f09e470469238c3b42708f27bae5e3bfbd4dc18..fa2c269aa3ef53e26dd94d4f0ab75d00f83420d3 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -9,6 +9,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - devstack - 20170606-0344
 * CentOS 7 - devstack - 20170609-0220
 * CentOS 7 - devstack - 20170808-0528
+* CentOS 7 - devstack - 20171014-2147
 * CentOS 7 - devstack - newton - 20170117-0005
 * CentOS 7 - devstack-mitaka - 20170130-0523
 * CentOS 7 - devstack-mitaka - 20170314-2255
@@ -17,15 +18,20 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - devstack-newton - 20170606-0427
 * CentOS 7 - devstack-newton - 20170707-0359
 * CentOS 7 - devstack-newton - 20170808-0528
+* CentOS 7 - devstack-newton - 20171014-2147
 * CentOS 7 - devstack-ocata - 20170606-0821
 * CentOS 7 - devstack-ocata - 20170609-0221
 * CentOS 7 - devstack-ocata - 20170808-0528
+* CentOS 7 - devstack-ocata - 20171014-2148
+* CentOS 7 - devstack-ocata - 20171016-0219
 * CentOS 7 - devstack-pike - 20170901-2223
+* CentOS 7 - devstack-pike - 20171014-2148
 * CentOS 7 - docker - 20170117-0003
 * CentOS 7 - docker - 20170120-1434
 * CentOS 7 - docker - 20170607-0203
 * CentOS 7 - docker - 20170609-0220
 * CentOS 7 - docker - 20170808-0528
+* CentOS 7 - docker - 20171016-0023
 * CentOS 7 - java-builder - 20170117-0004
 * CentOS 7 - java-builder - 20170126-0058
 * CentOS 7 - java-builder - 20170309-2355
@@ -36,6 +42,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - java-builder - 20170707-0359
 * CentOS 7 - java-builder - 20170807-1102
 * CentOS 7 - java-builder - 20170807-2145
+* CentOS 7 - java-builder - 20171014-2148
 * CentOS 7 - robot - 20170117-0004
 * CentOS 7 - robot - 20170210-1803
 * CentOS 7 - robot - 20170328-0206
@@ -43,6 +50,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - robot - 20170606-0345
 * CentOS 7 - robot - 20170609-0220
 * CentOS 7 - robot - 20170808-0529
+* CentOS 7 - robot - 20171016-0219
 * Fedora 23 (20151030 cloud)
 * Ubuntu 14.04 - devstack - 20170117-0004
 * Ubuntu 14.04 - docker - 20170117-0003
@@ -51,6 +59,7 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 14.04 - gbp - 20170706-1254
 * Ubuntu 14.04 - gbp - 20170808-0524
 * Ubuntu 14.04 - gbp - 20170823-0530
+* Ubuntu 14.04 - gbp - 20171016-0224
 * Ubuntu 14.04 - mininet - 20170117-0003
 * Ubuntu 14.04 - mininet - 20170130-0425
 * Ubuntu 14.04 - mininet - 20170207-2055
@@ -59,6 +68,7 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 14.04 - mininet - 20170609-0220
 * Ubuntu 14.04 - mininet - 20170611-0950
 * Ubuntu 14.04 - mininet - 20170808-0158
+* Ubuntu 14.04 - mininet - 20171001-1002
 * Ubuntu 14.04 - mininet-ovs-2.3 - 20170117-0004
 * Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
 * Ubuntu 14.04 - mininet-ovs-23 - 20170130-0415
@@ -76,5 +86,8 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 * Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
 * Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
+* Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+* Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 * Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548
+* Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212
 * Ubuntu 16.04 LTS (2016-05-03 cloudimg)

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
index 0baa3cf48cba73b360c8001f224dab3f6a0e5c51..df3d0d3127d955ef90284fdacd4d1cd63c7305f0 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -31,4 +31,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 6271d8ae450147b27588ef97320afbde883c8b55..238fe9b5be20f767ac013208132bd49178171abe 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -34,6 +34,9 @@
           # If the project is autorelease then we need to init and update submodules
           if [ "$GERRIT_PROJECT" == "releng/autorelease" ]; then
               git submodule update --init
+              # The previous checkout might have failed to remove directory of a submodule being removed.
+              # See https://stackoverflow.com/a/10761699
+              git clean -dff
           fi
 
 - builder:

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 4e9999b6112fdd8e23b56406f73d290fa9b0a599..dcea3236663fd23f1e64658ee47da86aaecf2712 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -368,8 +368,8 @@
           files: '**/*.xml'
 
     builders:
-      - jacoco-nojava-workaround
       - autorelease-checkout-gerrit-patch
+      - jacoco-nojava-workaround
       - autorelease-generate-release-patches
       # In a perfect world projects should be releasing separately and we consume them
       # via a project that pulls the release bits from each project from Nexus.

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index afd1f8091ff31f1cb55c5b96ecdfc4854690fc2a..9d5762eb478b6b8a666455b93a45612579078a6a 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -32,7 +32,7 @@
 
     # Mininet configuration
     tools_system_count: 3
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Features to install
     install-features: 'odl-genius-rest'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 640a508df9cc2e5c1543e802fcd9996b5fe5dbf8..b5cbd74e654cb5e85fc009721caffa65131b40f1 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -26,7 +26,7 @@
 
     # 3 Ubuntu VMs in JCloud configuration
     tools_system_count: 3
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
 
     # 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 0fc6787a1c2c2d665147896b6766e2d4d1a86950..20f4c4ba797939e0ac84c895331150cf31f0edd5 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -27,7 +27,7 @@
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
 
     # Features to install
     install-features: >

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 95f25335c39be1d17c2fcb361b94c6af108709a8..8d9b06a9addc2508d046f6acca0d0dbe6be12685 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -42,7 +42,7 @@
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
 
     # tools system image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index 4e1df523986960d094bbf1674f4781205661c8bc..459648a2e9f55bbb0b5015189d19282e586aa4ff 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -25,7 +25,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Features to install
     install-features: 'odl-lacp-ui'

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 1148ba026275b413200f318bd116827109c27885..ab53771056951c46eb20c63722d7a7fa071c5771 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # no mininet required
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
 
     # Features to install
     install-features: 'odl-netconf-callhome-ssh,odl-restconf'

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 8316a476cb5cebeabdf763c3a1813acd821c5945..7096461b415ec896dbd1dd73e16a83e291dc73af 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -27,7 +27,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
 
     # Features to install
     install-features: >

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 25c0f8377731a0ae5217669df8c732c4479dd311..8ee53dc44ebe31927684037cf0f00666e11389f9 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -57,7 +57,7 @@
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
     tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
@@ -122,7 +122,7 @@
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
     tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
@@ -182,7 +182,7 @@
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
     tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
index c06552104a129b041e89c38313318a4c1157d431..56b37cb5e0f22902fd6e569d640ce5b9398f0fae 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
@@ -28,7 +28,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
index 5acba48a8f4495f373ac155bb835dd948cf343e1..7d1f7012156919755d2b447e6ffc6cf6d7b60e58 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
@@ -28,7 +28,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index f22cf6577fce4b33d3e8d4771db42bbcde4714b6..c887d148012f020cba4bf20d630c8a98a8937d64 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -33,4 +33,4 @@
     robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # mininet image
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 4969a8c04980273a02d524ce776d4e4e31a2667a..8485e0843b2932fdb970ffd849569f28a2a6e82e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -33,4 +33,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index 29db0436dc3c2776f2f64e93eabdfc69da0083a7..a785724b2f1698dc3694c24fc54a57ebb53fa036 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -35,7 +35,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Plot Info
     01-plot-title: 'Maximum Links Full Mesh Topology'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index af8ada2254b968ee3e60f89e2b1989dd17ef6f66..88ac9984dcdd2f1960b4b3b5e428a3c03ee7925c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -36,6 +36,6 @@
     robot-options: '-v TEST_LENGTH:23h'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     schedule: '{schedule-saturday}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
index ea12e7d70589e5fa3e5d16a9ebdbe06dbb34240e..51bbf381252b3d36b08b38c692e016cb1a1d6f90 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
@@ -26,7 +26,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
index 6fd9bcc51b07238972e81b835da1d100d79ebd4f..7417eef5602c2265784f6d9204b5a10bd6b38810 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
@@ -26,7 +26,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
 
     # Features to install
     # yamllint disable-line rule:line-length

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 78ab76af7c9e0cd81ff9c42bfbe0d81e64641a7e..1425bd90243d2b37ce0cd63867a4a1974acf2186 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -32,4 +32,4 @@
     robot-options: '-v SWITCHES:3'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index 70ebb772aa207d694990d2bb5c8beb258286be22..b18405e769f79cff26da074f304d8ebfb3a6623e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -28,7 +28,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index 019ecb6a659cc78be6cf99e581a7e050f9b0673b..a4e48179f732dbb9543597a705b2a726aa93e48f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -34,7 +34,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 4ca86b32d8e5e824f81d47d5bb4c0687f8e6f953..daf54028325e4d12bbf8f048249895fb9744bbbf 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -79,7 +79,7 @@
     openstack_system2_image: CentOS 7 - devstack - 20171014-2147
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170808-0158
+    tools_system_image: Ubuntu 14.04 - mininet - 20171001-1002
 
     # Default Robot framework options
     robot-options: ''

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index db726654461497ea7409478896c4f7b65bbd044b..e0c6f5a3257b5c40e084d07bf3e2d36b3a8603b6 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -46,7 +46,8 @@
           build-timeout: 60
       - devstack-pre-pip-pike:
           build-timeout: 75
-      - docker
+      - docker:
+          build-timeout: 60
       - gbp
       - java-builder:
           build-timeout: 75

diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
index 3d0b85aa3aa94af0c6b24c79b6a17a78e485f176..567c712661adec9727c2f6f1b5f99bce0e546bc0 100644 (file)
--- a/jjb/unimgr/unimgr-csit-legato.yaml
+++ b/jjb/unimgr/unimgr-csit-legato.yaml
@@ -35,4 +35,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index 8d7b5f12dc7f0fbb1c3be363cc2d59b0a7ad2942..055bd062e8eb05b7f9c6a0c121a0d09250cdc363 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -31,4 +31,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index fd5ef6f3f95a611a8c17b904443a68d81e6ced3e..e1668090ced7627b95ffe022855b3145a5f550d7 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -20,7 +20,7 @@
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
-          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     install:
       - only:

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index 3a5367f40ef9208675274dfc3bf12c1067eab843..74a9434438cdb1167843621e883d7d82f8f02b94 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -31,4 +31,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212