Merge "Update Ubuntu 14.04 gbp 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/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/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index ccf4d62c4b5b2a95555d68414824c94e1360aa9b..afa65a756ad7766248f86a5124e81e3b07eb7e12 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/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