Merge "Update CentOS7 robot images to the latest"

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 3a5ab6cca2d6812577fe95db134b08b8c8992e3b..5ab3289f93d6f1377267586079a8e82e3394b027 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 - 20190924-232930.807
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 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 be50d245d961a2945c40abfec5a2b2189e47e628..e75e5302a9728a80e69f62551b67f44aed451537 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 - 20190924-232930.807
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 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 58ba25b3d05409fd48e3e0e3bfc1fa6676e0de57..4f052ef41eabd09666b59f57a408cffed3c6e40a 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 - 20190924-232930.807
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 HARDWARE_ID=odl-standard-2

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 04b1d491fbf44b30e6007cf2afc446b055c7d765..9d524b2d9ca0d83c0c1c652e5818b2acf127c4b3 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -83,7 +83,7 @@
     sm-features: ''
 
     # CSIT images configuration
-    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - 20190628-065204.973
+    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
 
     # Default Robot framework options

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 6e3b28c3549fbb4e3ef9762a5bb824177e4e6d50..a1e46356bc267fa8bd2696f415772375e92fe330 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -904,7 +904,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     docker_system_count: 1
     docker_system_flavor: 'odl-standard-1'
-    docker_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
 
     #####################
     # Job Configuration #
@@ -1036,10 +1036,10 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
@@ -1448,10 +1448,10 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'