From b8da70070c1e6b348c040e95cf2bbf352658a4fe Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 27 Jul 2018 17:58:35 -0700 Subject: Cleanup node names Cleanup node names and labels "basebuild" to "builder". New packer builds would need to also created new images using "builder" in their name to eventually change the image names too. Change-Id: Icf2975390ca1eda7b2646f6667d745b5587bb474 Issue-ID: CIMAN-182 Signed-off-by: Jessica Wagantall --- jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg | 3 --- jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg | 3 --- jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg | 3 --- jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg | 3 --- jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg | 3 +++ jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg | 3 +++ jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg | 3 +++ jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg | 3 +++ 10 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg delete mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg delete mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg delete mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg create mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg create mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg create mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg create mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg (limited to 'jenkins-config/clouds/openstack') 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 09c0807bb..41440ff0a 100644 --- 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 - 20180328-1726 -LABELS=centos7-basebuild-2c-1g centos7-builder-2c-1g +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 4030359a4..dbabd5f29 100644 --- 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 - 20180328-1726 -LABELS=centos7-basebuild-4c-4g centos7-builder-4c-4g +LABELS=centos7-builder-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg deleted file mode 100644 index 8aa9f3117..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 -LABELS=ubuntu1604-basebuild-2c-1g ubuntu1604-builder-2c-1g -HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg deleted file mode 100644 index 928f66946..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 -LABELS=ubuntu1604-basebuild-4c-2g ubuntu1604-builder-4c-2g -HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg deleted file mode 100644 index ce326bca4..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 -LABELS=ubuntu1604-basebuild-4c-4g ubuntu1604-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg deleted file mode 100644 index e7c415786..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 -LABELS=ubuntu1604-basebuild-8c-8g ubuntu1604-builder-8c-8g -HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg new file mode 100644 index 000000000..b000ff6ce --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 +LABELS=ubuntu1604-builder-2c-1g +HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg new file mode 100644 index 000000000..5bff88e70 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 +LABELS=ubuntu1604-builder-4c-2g +HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg new file mode 100644 index 000000000..48112d50f --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 +LABELS=ubuntu1604-builder-4c-4g +HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg new file mode 100644 index 000000000..30a7bcda7 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 +LABELS=ubuntu1604-builder-8c-8g +HARDWARE_ID=v2-highcpu-8 -- cgit 1.2.3-korg