From 081c3b7862465b8c43c705366f5090fd619f01f0 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Tue, 3 Nov 2020 14:25:06 -0500 Subject: [PATCH] Add Labels into cloud config files Add labels where missing Going forward we will use these for our JCASC efforts Signed-off-by: Aric Gardner Change-Id: I4acfb8a61fa455b57e850e19dfd56628116fa09f --- jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg | 1 + jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg | 1 + jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg | 1 + jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg | 2 +- 7 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg index 3021ff55..0b921edd 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg @@ -1,3 +1,4 @@ +LABELS=centos7-builder-1c-1g IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200317-165605.039 VOLUME_SIZE=20 HARDWARE_ID=v2-highcpu-1 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg index 62407da1..5f4ed865 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg @@ -1,3 +1,4 @@ +LABELS=centos7-docker-2c-8g-200g IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200317-104237.628 HARDWARE_ID=v2-standard-2 VOLUME_SIZE=200 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg index 00cb8b3a..a1a39a1a 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg @@ -1,3 +1,4 @@ +LABELS=centos7-docker-2c-8g IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200317-104237.628 HARDWARE_ID=v2-standard-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg index 1e1fddca..16cb7497 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg @@ -1,3 +1,4 @@ +LABELS=centos8-builder-1c-1g IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200403-151332.560 VOLUME_SIZE=20 HARDWARE_ID=v2-highcpu-1 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg index 1cf46725..c6edac7d 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675 LABELS=ubuntu1804-builder-2c-2g +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675 HARDWARE_ID=v2-highcpu-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index 1c6f38aa..d3310896 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675 LABELS=ubuntu1804-builder-4c-4g +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675 HARDWARE_ID=v2-highcpu-4 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg index 3df02e57..fbaf72b8 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200317-104132.496 LABELS=ubuntu1804-docker-4c-4g +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200317-104132.496 HARDWARE_ID=v2-highcpu-4 VOLUME_SIZE=20 -- 2.16.6