From da6d8fc669e2c9e2298850e3a6cb1a8c3a456385 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 6 Aug 2020 23:27:20 +1000 Subject: [PATCH] Revert "Update cloud image" This reverts commit 0d5a67dd8b26972a459b1295683b261cb9060ef7. Change-Id: I419677e60a17640098cb980b747e72ded108a985 Signed-off-by: Anil Belur --- .../openstack/odlvex/centos7-docker-1c-4g.cfg | 2 +- .../openstack/odlvex/centos7-docker-2c-2g.cfg | 2 +- .../openstack/odlvex/centos7-docker-2c-8g.cfg | 2 +- jjb/defaults.yaml | 6 ++--- jjb/integration/integration-templates.yaml | 22 +++++++++---------- jjb/netconf/netconf-csit-callhome.yaml | 2 +- jjb/netconf/netconf-userfeatures.yaml | 2 +- .../netvirt-csit-hwvtep-openstack.yaml | 10 ++++----- ...ugin-csit-bundle-based-reconciliation.yaml | 2 +- .../openflowplugin-csit-cbench.yaml | 2 +- ...flowplugin-csit-clustering-bulkomatic.yaml | 2 +- ...lugin-csit-clustering-perf-bulkomatic.yaml | 2 +- .../openflowplugin-csit-clustering.yaml | 2 +- .../openflowplugin-csit-flow-services.yaml | 2 +- .../openflowplugin-csit-longevity.yaml | 2 +- .../openflowplugin-csit-perf-bulkomatic.yaml | 2 +- ...flowplugin-csit-perf-stats-collection.yaml | 2 +- .../openflowplugin-csit-sanity.yaml | 2 +- .../openflowplugin-csit-scale-link.yaml | 2 +- .../openflowplugin-csit-scale-switch.yaml | 2 +- .../openflowplugin-csit-scale.yaml | 2 +- 21 files changed, 37 insertions(+), 37 deletions(-) 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 413e724e0..5ab3289f9 100644 --- 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 - 20200801-220136.401 +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 0d7c50b0b..e75e5302a 100644 --- 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 - 20200801-220136.401 +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 7d7aa5c98..4f052ef41 100644 --- 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 - 20200801-220136.401 +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 a328195fc..ce46e1da2 100644 --- 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 - 20200801-010144.168 - openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200801-000156.903 - openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200801-190141.781 + openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851 + 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 # Default Robot framework options robot-options: '' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index e6f512f75..a7b1328e8 100644 --- 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 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### # 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 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### @@ -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 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### # 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 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### # 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 - 20200801-220136.401' + docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840' ##################### # 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 - 20200801-230142.896' + 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 - x86_64 - 20200801-230142.896' + 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-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### # 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 - 20200801-230142.896' + 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 - x86_64 - 20200801-230142.896' + 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-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### # Job configuration # diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index abe038662..e7d4b898e 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -31,7 +31,7 @@ scope: 'only' # no mininet required - tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227 + tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610 # 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 93457d0b2..ffbef7f1f 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -34,7 +34,7 @@ - all: scope: 'all' - tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227 + tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610 # Features to install install-features: > diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index cd5bbd9c5..84f80723f 100644 --- 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 - x86_64 - 20200801-180146.111 + 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 @@ -68,7 +68,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 - x86_64 - 20200801-180146.111 + 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 @@ -120,7 +120,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 - x86_64 - 20200801-180146.111 + 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 @@ -172,7 +172,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 - x86_64 - 20200801-180146.111 + 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 @@ -224,7 +224,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 - x86_64 - 20200801-180146.111 + 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 c271130d9..48ad853c0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -28,7 +28,7 @@ # Job images tools_system_count: 2 - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # 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 cd25e53e1..f26a3385d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -29,7 +29,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # 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 fc05d5077..e102cc38e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -31,7 +31,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # 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 fe9523583..51f4533e5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -31,7 +31,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 219b57405..f933ccbce 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -31,7 +31,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 926c68c03..c1c392ff3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -31,7 +31,7 @@ install: 'all' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 4a812b25e..b41d61555 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -33,7 +33,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 5ce4c5319..27a3fabaf 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -31,7 +31,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # 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 5b4ee0390..1ff6ef0a8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -32,7 +32,7 @@ # Job images odl_system_flavor: 'odl-standard-4' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # 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 cd47ff9f5..bb1f51209 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -30,7 +30,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 7bce1be24..b1b06444a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -29,7 +29,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 5f3070288..41ea379aa 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -29,7 +29,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 8ad83c447..e688a89b2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -31,7 +31,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' # Features to install install-features: > -- 2.36.6