diff options
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg | 2 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg | 2 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg (renamed from jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg) | 2 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg (renamed from jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg) | 2 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg (renamed from jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg) | 2 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg (renamed from jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg) | 2 |
6 files changed, 6 insertions, 6 deletions
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-builder-2c-1g.cfg index 8aa9f3117..b000ff6ce 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg @@ -1,3 +1,3 @@ IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 -LABELS=ubuntu1604-basebuild-2c-1g ubuntu1604-builder-2c-1g +LABELS=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-builder-4c-2g.cfg index 928f66946..5bff88e70 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg @@ -1,3 +1,3 @@ IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 -LABELS=ubuntu1604-basebuild-4c-2g ubuntu1604-builder-4c-2g +LABELS=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-builder-4c-4g.cfg index ce326bca4..48112d50f 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg @@ -1,3 +1,3 @@ IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 -LABELS=ubuntu1604-basebuild-4c-4g ubuntu1604-builder-4c-4g +LABELS=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-builder-8c-8g.cfg index e7c415786..30a7bcda7 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg @@ -1,3 +1,3 @@ IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010 -LABELS=ubuntu1604-basebuild-8c-8g ubuntu1604-builder-8c-8g +LABELS=ubuntu1604-builder-8c-8g HARDWARE_ID=v2-highcpu-8 |