Merge "Fix validate-autorelease JAVA_HOME not set"

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
index 5ab3289f93d6f1377267586079a8e82e3394b027..f7ef63c7d4caf6467d159baedf51b5f661c83963 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
 HARDWARE_ID=odl-standard-1

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
index e75e5302a9728a80e69f62551b67f44aed451537..806e79ee7e0fd9b434b685a453783ba85f5ec00a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
 HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
index 4f052ef41eabd09666b59f57a408cffed3c6e40a..c69951670df7b59784e41a9102e85cd47eb3f11a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
 HARDWARE_ID=odl-standard-2

diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-aluminium.yaml
new file mode 100644 (file)
index 0000000..64322fa
--- /dev/null
+++ b/jjb/autorelease/validate-autorelease-aluminium.yaml
@@ -0,0 +1,37 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-aluminium
+    jobs:
+      - '{project-name}-validate-autorelease-{stream}'
+    stream: aluminium
+    branch: master
+    project-name:
+      - aaa:
+          project: aaa
+      - bgpcep:
+          project: bgpcep
+      - daexim:
+          project: daexim
+      - genius:
+          project: genius
+      - infrautils:
+          project: infrautils
+      - integration-distribution:
+          project: integration/distribution
+      - jsonrpc:
+          project: jsonrpc
+      - lispflowmapping:
+          project: lispflowmapping
+      - netconf:
+          project: netconf
+      - netvirt:
+          project: netvirt
+      - neutron:
+          project: neutron
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - serviceutils:
+          project: serviceutils

diff --git a/jjb/autorelease/view-autorelease-aluminium.yaml b/jjb/autorelease/view-autorelease-aluminium.yaml
new file mode 100644 (file)
index 0000000..c44a919
--- /dev/null
+++ b/jjb/autorelease/view-autorelease-aluminium.yaml
@@ -0,0 +1,39 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_aluminium
+    name: releng-view-autorelease-aluminium
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
+
+- view:
+    name: Merge-Aluminium
+    description: 'List of Aluminium Merge jobs for Autorelease'
+    job-name:
+      - 'aaa-merge-aluminium'
+      - 'bgpcep-merge-aluminium'
+      - 'daexim-merge-aluminium'
+      - 'genius-merge-aluminium'
+      - 'infrautils-merge-aluminium'
+      - 'integration/distribution-merge-aluminium'
+      - 'jsonrpc-merge-aluminium'
+      - 'lispflowmapping-merge-aluminium'
+      - 'netconf-merge-aluminium'
+      - 'netvirt-merge-aluminium'
+      - 'neutron-merge-aluminium'
+      - 'openflowplugin-merge-aluminium'
+      - 'ovsdb-merge-aluminium'
+      - 'serviceutils-merge-aluminium'
+    <<: *releng_autorelease_view_common_aluminium

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index aeab9b814dc2b5f82cad11d0f7307ee7015e7c60..d3ebc33969acb130014c1edeec48e8584f1101b0 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -87,9 +87,9 @@
     elasticsearch-attribute: 'disabled'
 
     # CSIT images configuration
-    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
+    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200501-010133.750
     openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
-    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
+    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200601-190140.080
 
     # Default Robot framework options
     robot-options: ''

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 422f3b160ec98570a7fa01a0efc0ab27fcdce1d0..1cb813769a9a0f178d64a8c59d7123be2c6e5cb1 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -82,7 +82,7 @@
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     #####################
     # Job configuration #
@@ -191,7 +191,7 @@
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
 
     #####################
@@ -500,7 +500,7 @@
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     #####################
     # Job Configuration #
@@ -612,7 +612,7 @@
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     #####################
     # Job configuration #
@@ -922,7 +922,7 @@
     controller-max-mem: '2048m'
     docker_system_count: '1'
     docker_system_flavor: 'odl-standard-1'
-    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752'
 
     #####################
     # Job Configuration #
@@ -1057,13 +1057,13 @@
     controller-max-mem: '2048m'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     #####################
     # Job configuration #
@@ -1485,13 +1485,13 @@
     controller-max-mem: '2048m'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     #####################
     # Job configuration #

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 8b83aebe96e76d1b2a452a5a57542b5ac1a8285f..574dfc2c4ebfe80854a3b4c12338fafdf5a30e88 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # no mininet required
-    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250
 
     # 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 02f2ffbdc2f3552b0cfe4a10a99f8ce86cd1f244..60a8c5b9e8140e3d1321d56301a27f9953d4ef32 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -29,7 +29,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250
 
     # Features to install
     install-features: >

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 80d00fb7a758bf357aeda917d491890a455676ef..27f79f1f5b52e5390e02c0f414727c55592f0c9d 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -17,7 +17,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -67,7 +67,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -116,7 +116,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2

diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
index 3fca0825abe306784b053e12d4c044546be0e5c5..cb35b60aad704d2ee9e30342d545fb7d4db65511 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
@@ -25,7 +25,7 @@
 
     # Job images
     tools_system_count: 2
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index be28da8d5be220a7957dc2dc66c110f1c14ff554..f4f6c94caf2ef6c003a11dbf03d4f1b413eb3a8c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 27007e3d08ebffbab57bbe6186a3a1e4fe519c20..358ab18490e59aec2f403eccd1b0afed2278534f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index ff8f0e119700c1115002150313aa37a907bf3169..38341100ff920d27962d9b6e0b8bbfb494e6cce5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 2e25311f6d1595cb139f10b4d646925f8446f1f8..3519fe0e8ef45ea93386f10cb451b852cfb29ca4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 3c0b7c64175460018a062bbd2bfd50c26d25c064..0facb7884704a939c35eed0ab901f8249ca7cf6b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -27,7 +27,7 @@
           install: 'all'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 6fe25d0fddacfb80cfec2fe12d056ede3a66e185..223cdcf0fec69d9e38232e9d9e7dcbb1c4670ccb 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -30,7 +30,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index c690cc11c48dc8dd796d5b94d99872f3695b7cfc..70fdc5d74cc029b0501dfa31165500af57208f3d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index da81f9e39e3dce47720c203b50bd83186e927415..151c359998a5cf77315597e53ef71c77c9282e3b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 4c3fdfdb28eac7f158094de5c9f55703873f5db9..c0a3c9e13b7f7e1d6275833c09f3104db748cdec 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 2f15c4062d8ac93f4e5bb5c56744eee92dc960ff..3db4692bf5995af716334dcbf0bfbea67cdc6c18 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 54a71fbf33a087dc8b282358a28ed74e3d70b9aa..a40ab4a53235d68cf469d89ddebec6b50c5c4e81 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 74a5ef9fce4820250832f6d2fb75b72fd8c6eff6..7d0ee259321392f023a1e0e073136acd176d8782 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
 
     # Features to install
     install-features: >