From: Eric Ball Date: Thu, 11 Apr 2019 17:04:59 +0000 (+0000) Subject: Merge "Update images for all build nodes" X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=dde1e3c6a31f3bf2d067eb3d933b9a0aca182427;hp=07692838aa0635a24fbfefabf129cf08c1b418c3 Merge "Update images for all build nodes" --- 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 573088f..6709397 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180730-233146.339 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 HARDWARE_ID=v1-standard-1 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg index 04b10e5..0a79f04 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index b8e9558..e632f1f 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180730-233146.339 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 HARDWARE_ID=v1-standard-1 NETWORK_ID=e84c8d94-1d74-4593-b24f-9a091cd3b9bf USER_DATA_ID=jenkins-init-script diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg index 88f8f32..e3fe26a 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - 20180626-234332.312 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20181004-095408.110 HARDWARE_ID=v1-standard-1 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg index c6f2c02..9dbb8b3 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180724-181244.462 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190110-225527.869 HARDWARE_ID=v2-highcpu-8