diff options
Diffstat (limited to 'jenkins-config/clouds/openstack/cattle')
13 files changed, 15 insertions, 18 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 deleted file mode 100644 index 38f914e84..000000000 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234 -LABELS=centos7-builder-2c-1g -HARDWARE_ID=v3-standard-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 deleted file mode 100644 index a2cdcaaa6..000000000 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234 -LABELS=centos7-builder-4c-4g -HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-1g.cfg index 4567d1ed5..9a0967209 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-1g.cfg @@ -1,3 +1,3 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220919-201912.261 -LABELS=centos7-docker-8c-8g -HARDWARE_ID=v3-standard-8 +LABELS=centos7-docker-2c-1g +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg index 5e96729c7..bdb3ccb02 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-022318.551 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230131-200810.126 LABELS=centos8-builder-2c-1g HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg index 4bc136346..2bff0e7b8 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-022318.551 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230131-200810.126 LABELS=centos8-builder-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-2c-8g.cfg new file mode 100644 index 000000000..9e8361fdf --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/centos8-docker-2c-8g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297 +LABELS=centos8-docker-2c-8g +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg new file mode 100644 index 000000000..d7d096ce2 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297 +LABELS=centos8-docker-4c-4g +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg index b58f8dc7b..bebde4b23 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20220912-171155.418 +IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297 LABELS=centos8-docker-8c-8g HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg index 0c5f2967f..0076226b9 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=CentOS Stream 8 - redis - - 150980909-9011 +IMAGE_NAME=CentOS Stream 8 - redis - - 310180101-1010 LABELS=centos8-redis-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg deleted file mode 100644 index 2f7b62ae7..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220919-172402.717 -LABELS=ubuntu1804-helm-2c-1g -HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg index 887d9a5b9..fab7f2f26 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20221013-010346.073 +IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20230412-164405.694 LABELS=ubuntu2004-builder-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg index c36ebcdf9..0a2e2e215 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - x86_64 - 20220919-201946.022 +IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - x86_64 - 20230414-200946.220 LABELS=ubuntu2004-docker-8c-8g HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg index a7eab6877..ccef6ab53 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 20.04 - helm - x86_64 - 20220907-184211.729 +IMAGE_NAME=ZZCI - Ubuntu 20.04 - helm - x86_64 - 20230405-210810.069 LABELS=ubuntu2004-helm-2c-1g HARDWARE_ID=v3-standard-4 |