diff options
Diffstat (limited to 'jenkins-config/clouds/openstack')
20 files changed, 23 insertions, 51 deletions
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg index 4f350de7e..af5fa37b3 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230415-024622.013 LABELS=centos7-builder-2c-2g -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg index 916f74711..54928f44c 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230415-024622.013 LABELS=centos7-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg deleted file mode 100644 index b175a0151..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 -LABELS=centos7-builder-8c-8g -HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg index 1a2f361fc..5ca4c6c5c 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg @@ -1,4 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230505-094222.041 LABELS=centos7-docker-2c-2g -HARDWARE_ID=v2-standard-2 -VOLUME_SIZE=20 +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg index b78877254..6d6e88e31 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg @@ -1,4 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230505-094222.041 LABELS=centos7-docker-4c-4g -HARDWARE_ID=v2-standard-4 -VOLUME_SIZE=20 +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos8-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos8-builder-2c-2g.cfg new file mode 100644 index 000000000..87b4ea90d --- /dev/null +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos8-builder-2c-2g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084 +LABELS=centos8-builder-2c-2g +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index 768da3bf4..621190e9c 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -1,4 +1,4 @@ -# Cloud Configuration +# OpenStack Cloud Configuration CLOUD_CREDENTIAL_ID=fdiovex-ci CLOUD_URL=https://auth.vexxhost.net/v3 CLOUD_IGNORE_SSL=false @@ -6,15 +6,14 @@ CLOUD_ZONE=ca-ymq-1 OS_CLOUD=vexci # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200315-024729.521 -HARDWARE_ID=v2-highcpu-2 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230415-024622.013 +HARDWARE_ID=v3-standard-2 NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03 USER_DATA_ID=jenkins-init-system INSTANCE_CAP=20 SANDBOX_CAP=5 FLOATING_IP_POOL= SECURITY_GROUPS=default -AVAILABILITY_ZONE=ca-ymq-2 STARTUP_TIMEOUT=600000 KEY_PAIR_NAME=jenkins NUM_EXECUTORS=1 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg deleted file mode 100644 index 2b95de240..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109 -LABELS=ubuntu1604-builder-2c-2g -HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg deleted file mode 100644 index 56a4756c2..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109 -LABELS=ubuntu1604-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg deleted file mode 100644 index 472953707..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109 -LABELS=ubuntu1604-builder-8c-32g -HARDWARE_ID=v2-highcpu-32 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg deleted file mode 100644 index 3ef5666a5..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109 -LABELS=ubuntu1604-builder-8c-8g -HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg deleted file mode 100644 index 597c0b4ac..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200510-225624.603 -LABELS=ubuntu1604-docker-4c-4g -HARDWARE_ID=v2-standard-4 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg deleted file mode 100644 index c2c9c654e..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173 -LABELS=ubuntu1804-builder-2c-2g.cfg -HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg deleted file mode 100644 index 6ac6d7db0..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173 -LABELS=ubuntu1804-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg deleted file mode 100644 index 5ced41c26..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173 -LABELS=ubuntu1804-builder-8c-8g.cfg -HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg deleted file mode 100644 index d4be182b2..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200107-191807.978 -LABELS=ubuntu1804-docker-4c-4g -HARDWARE_ID=v2-standard-4 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g deleted file mode 100644 index 789129e0a..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20191209-185146.016 -LABELS=ubuntu1804arm-docker-4c-4g -HARDWARE_ID=v2-standard-4 -VOLUME_SIZE=20 - diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-4c-4g.cfg new file mode 100644 index 000000000..b7f73cdf0 --- /dev/null +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-4c-4g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20220817-125321.417 +LABELS=ubuntu2004-builder-4c-4g +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-arm64-4c-4g b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-arm64-4c-4g new file mode 100644 index 000000000..3d828a3bc --- /dev/null +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-arm64-4c-4g @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - arm64 - 20211120-085353.738 +LABELS=ubuntu2004-builder-arm64-4c-4g +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-docker-4c-4g.cfg new file mode 100644 index 000000000..e37ea1eed --- /dev/null +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-docker-4c-4g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - x86_64 - 20230629-181907.194 +LABELS=ubuntu2004-docker-4c-4g +HARDWARE_ID=v3-standard-4 |