diff options
Diffstat (limited to 'jenkins-config')
13 files changed, 4 insertions, 17 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 f3f6e4cf2..1b3d97cbb 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 LABELS=centos7-builder-2c-1g HARDWARE_ID=v3-standard-2 -VOLUME_SIZE=20 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 469f189b6..43361f810 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 LABELS=centos7-builder-4c-4g HARDWARE_ID=v3-standard-4 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg index c26976b26..d8ca72675 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211011-195645.572 LABELS=centos7-docker-8c-8g HARDWARE_ID=v3-standard-8 -VOLUME_SIZE=20 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 8bb7c0366..f72d6cc77 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=CentOS 7 - redis - - 50880808-8011 LABELS=centos7-redis-4c-4g HARDWARE_ID=v3-standard-4 -VOLUME_SIZE=50 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 7676454ef..575fee614 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -6,8 +6,7 @@ CLOUD_ZONE=ca-ymq-1 # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 -VOLUME_SIZE=20 -HARDWARE_ID=v1-standard-1 +HARDWARE_ID=v3-standard-1 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf USER_DATA_ID=jenkins-init-script INSTANCE_CAP=75 diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg index 9f9d8678c..b41ed8fd1 100644 --- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -4,4 +4,3 @@ HARDWARE_ID=v3-standard-4 INSTANCE_CAP=1 NUM_EXECUTORS=4 RETENTION_TIME=4320 -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 f36cf96fd..3c483b4cc 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,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210317-233509.164 LABELS=ubuntu1804-builder-4c-4g HARDWARE_ID=v3-standard-4 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg index 772004b58..38273e129 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084 LABELS=ubuntu1804-docker-8c-16g HARDWARE_ID=v3-standard-16 -VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg index 65d736920..93b99f81d 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084 LABELS=ubuntu1804-docker-8c-8g HARDWARE_ID=v3-standard-8 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg index cd44cbc2b..1ec526219 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711 LABELS=ubuntu1804-docker-arm64-4c-2g -HARDWARE_ID=lf-standard-2 -VOLUME_SIZE=20 +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg index 47fa5e75b..8b7593ec8 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711 LABELS=ubuntu1804-docker-arm64-4c-4g -HARDWARE_ID=lf-standard-4 -VOLUME_SIZE=20 +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg index 76bfc7055..b77319646 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084 LABELS=ubuntu1804-docker-v1-8c-8g -HARDWARE_ID=v1-standard-8 -VOLUME_SIZE=50 +HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg index 5610c6ad1..e4aac1913 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=Ubuntu 18.04 - memcached - - 120780707-7003 LABELS=ubuntu1804-memcached-4c-4g HARDWARE_ID=v3-standard-4 -VOLUME_SIZE=50 |