Merge "Upgrade global-jjb"

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
index 1bd5189..201ae92 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190912-234852.235
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
index 1fea53c..4be9cf2 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190912-234852.235
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
index 33e096f..e19e146 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190610-221311.883
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190912-234755.337
 LABELS=centos7-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index aa8c246..8f96218 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -15,6 +15,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
     project: 'logging-analytics'
     stream:
       - 'master':