diff options
Diffstat (limited to 'jenkins-config/clouds/openstack/cattle')
3 files changed, 8 insertions, 2 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg index ba781783f..4c0766cae 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - 20171102-0130 +IMAGE_NAME=Ubuntu 16.04 - redis - 20180101-1003 LABELS=centos7-redis-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 37c4bcaf0..7872de343 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -8,7 +8,7 @@ CLOUD_ZONE=ca-ymq-1 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180601-1002 HARDWARE_ID=v1-standard-1 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf -USER_DATA_ID=jenkins-init-system +USER_DATA_ID=jenkins-init-script INSTANCE_CAP=75 SANDBOX_CAP=4 FLOATING_IP_POOL= diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg new file mode 100644 index 000000000..3fb352b50 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -0,0 +1,6 @@ +IMAGE_NAME=Ubuntu 16.04 - docker - 20180101-1003 +LABELS=queue-docker-4c-4g +HARDWARE_ID=v2-highcpu-4 +INSTANCE_CAP=1 +NUM_EXECUTORS=4 +RETENTION_TIME=4320 |