diff options
Diffstat (limited to 'jenkins-config')
23 files changed, 20 insertions, 60 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 3502922d3..4f350de7e 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 - 20191215-024720.020 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 LABELS=centos7-builder-2c-2g HARDWARE_ID=v2-highcpu-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 7f269d69d..916f74711 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 - 20191215-024720.020 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 LABELS=centos7-builder-4c-4g HARDWARE_ID=v2-highcpu-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 index dfb2d1cf0..b175a0151 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191215-024720.020 +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 new file mode 100644 index 000000000..8c7857c0b --- /dev/null +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg @@ -0,0 +1,4 @@ +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230 +LABELS=centos7-docker-2c-2g +HARDWARE_ID=v2-standard-2 +VOLUME_SIZE=10 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 4b215e56f..51bd100c3 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,4 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200105-094324.141 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230 LABELS=centos7-docker-4c-4g HARDWARE_ID=v2-standard-4 VOLUME_SIZE=10 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index e8d47dd67..1fd156ccb 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -6,7 +6,7 @@ CLOUD_ZONE=ca-ymq-1 OS_CLOUD=vexci # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191215-024720.020 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200315-024729.521 HARDWARE_ID=v2-highcpu-2 NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03 USER_DATA_ID=jenkins-init-system 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 index 597449019..2b95de240 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191119-214815.550 +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 index b9ffedbf6..56a4756c2 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191119-214815.550 +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 index 7d3770541..472953707 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191119-214815.550 +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 index 8bda88348..3ef5666a5 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191119-214815.550 +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 index 09d65e0f5..c299aeccc 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190810-225705.438 -LABELS=centos7-docker-4c-4g +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200510-225624.603 +LABELS=ubuntu1604-docker-4c-4g HARDWARE_ID=v2-standard-4 VOLUME_SIZE=10 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 index 2bb05981e..c2c9c654e 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20191226-084321.945 +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 index 8e24bd22a..6ac6d7db0 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20191226-084321.945 +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-32g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-32g.cfg deleted file mode 100644 index 883f7d5a0..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-32g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20191226-084321.945 -LABELS=ubuntu1804-builder-8c-32g -HARDWARE_ID=v2-highcpu-32 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 index bcc7fd199..5ced41c26 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20191226-084321.945 +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-builder-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-arm64-4c-4g.cfg deleted file mode 100644 index 4f4cfa7d8..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-arm64-4c-4g.cfg +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - arm64 - 20190820-203918.821 -LABELS=ubuntu1804-builder-arm64-4c-4g -HARDWARE_ID=v2-highcpu-4 -VOLUME_SIZE=10 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g index c46c1ecf8..8490e31c0 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-arm64-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g @@ -1,4 +1,5 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20191209-185146.016 -LABELS=ubuntu1804-docker-arm64-4c-4g +LABELS=ubuntu1804arm-docker-4c-4g HARDWARE_ID=v2-standard-4 VOLUME_SIZE=10 + diff --git a/jenkins-config/clouds/openstack/FDIOVEX/centos7-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/centos7-basebuild-4c-4g.cfg deleted file mode 100644 index 3348ca5d2..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX/centos7-basebuild-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=CentOS 7 - basebuild - 20170322-1518 -LABELS=centos7-basebuild-4c-4g -HARDWARE_ID=v1-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg deleted file mode 100644 index a21118e45..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# Cloud Configuration -CLOUD_CREDENTIAL_ID=vexx-fdio -CLOUD_URL=https://auth.vexxhost.net/v3/ -CLOUD_IGNORE_SSL=false -CLOUD_ZONE=ca-ymq-1 -OS_CLOUD=vex - -# Default Template Configuration -IMAGE_NAME=CentOS 7 - basebuild - 20170322-1518 -HARDWARE_ID=v1-standard-1 -NETWORK_ID=1b9e78ec-b49b-4ebe-9e16-0ae9baddb754 -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 -JVM_OPTIONS= -FS_ROOT=/w -RETENTION_TIME=1 diff --git a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1404-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1404-basebuild-4c-4g.cfg deleted file mode 100644 index abb6cae97..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1404-basebuild-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=Ubuntu 14.04 - basebuild - 20170331-2223 -LABELS=ubuntu1404-basebuild-4c-4g -HARDWARE_ID=v1-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-4c-4g.cfg deleted file mode 100644 index 9744affed..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20180406-1741 -LABELS=ubuntu1604-basebuild-4c-4g -HARDWARE_ID=v1-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-8c-32g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-8c-32g.cfg deleted file mode 100644 index 2d0ec0be8..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-8c-32g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171103-2145 -LABELS=ubuntu1604-basebuild-8c-32g -HARDWARE_ID=v2-standard-8 diff --git a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1804-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1804-basebuild-4c-4g.cfg deleted file mode 100644 index 5b5885724..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1804-basebuild-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=Ubuntu 18.04 - basebuild - 20180523-2109 -LABELS=ubuntu1804-basebuild-4c-4g -HARDWARE_ID=v2-highcpu-4 |