Merge "Disable harvesting of JVM metrics via ELASTICSEARCHATTRIBUTE=disabled for...

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 4fcea4a390c4b4cc27c7232b645e4fe92c02f6d1..97deb3c16f3021afd66d9b090e4d09eea67cb7c8 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -48,16 +48,7 @@ Following are the list of published images available to be used with Jenkins job
 * ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
 * ZZCI - Ubuntu 16.04 - kubernetes - 20190206-080347.936
 * ZZCI - Ubuntu 16.04 - kubernetes - 20190211-225526.126
-* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
-* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20180723-235543.682
-* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
-* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366
 * ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240
-* ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-* ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
-* ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041
-* ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507
-* ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881

diff --git a/global-jjb b/global-jjb
index eededd9e9094b6a19e2611d40c29dca30559c42b..4ac79cd48227bbbfadbab995dc4535a61a7ee26f 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit eededd9e9094b6a19e2611d40c29dca30559c42b
+Subproject commit 4ac79cd48227bbbfadbab995dc4535a61a7ee26f