diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg index 779e40d96..d7c9e6ccf 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-2c-1g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20231213-090206.813 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg index ef26f8ae0..a10267ba1 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-2c-2g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20231213-090206.813 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg index 3ad24215d..5fcc43c0e 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-2c-8g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20231213-090206.813 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg index d92a44def..7afcfd8ac 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-4c-16g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20231213-090206.813 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg index d8720d5d8..dda109237 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-4c-4g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20231213-090206.813 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg index 755cfbbe4..822c6f2ae 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-8c-8g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20231213-090206.813 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845 HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg index 4df5983d9..0a3a0d7c0 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-1c-4g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20240101-220119.494 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg index 82d2c79e8..c00bd80bc 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-2c-2g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20240101-220119.494 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg index 92cb73459..3280d8715 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-2c-8g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20240101-220119.494 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg index 2237e57d6..d623bf53f 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-4c-4g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20240101-220119.494 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg index bdfba145c..7814bb5d7 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-robot-2c-8g -IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20230501-220152.957 +IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20240101-220154.458 HARDWARE_ID=v3-standard-2 INSTANCE_CAP=16 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg index 55ad810f4..3025a4072 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-2c-1g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230727-135233.501 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230801-160108.418 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg index f3d99ca8f..6fbc9658f 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-2c-2g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230727-135233.501 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230801-160108.418 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg index 5477f691c..6a3a308aa 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-2c-8g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230727-135233.501 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230801-160108.418 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg index 6830cf690..5fb649d7c 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-4c-16g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230727-135233.501 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230801-160108.418 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg index b89912826..cd70a4e00 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-4c-4g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230727-135233.501 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230801-160108.418 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg index 28610ebd3..f39a4c652 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-8c-8g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230727-135233.501 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230801-160108.418 HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg index eb36e1307..58abeea52 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg @@ -1,4 +1,4 @@ LABELS=centos8-robot-2c-8g -IMAGE_NAME=ZZCI - CentOS Stream 8 - robot - x86_64 - 20231213-111243.663 +IMAGE_NAME=ZZCI - CentOS Stream 8 - robot - x86_64 - 20240101-010215.978 HARDWARE_ID=v3-standard-2 INSTANCE_CAP=16 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index dbd08e66b..7400de792 100644 --- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg +++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg @@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20231213-090206.813 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240101-060132.845 AVAILABILITY_ZONE=nova HARDWARE_ID=v3-standard-2 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229 diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg index b24cf1708..d60e89219 100644 --- a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg @@ -1,4 +1,4 @@ LABELS=queue-disttest-2c-1g -IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20230501-220152.957 +IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20240101-220154.458 HARDWARE_ID=v3-standard-2 INSTANCE_CAP=1 diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg index 1ad852e31..db0c3e4f6 100644 --- a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg @@ -1,5 +1,5 @@ LABELS=queue-intque-2c-1g -IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20230501-220152.957 +IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20240101-220154.458 HARDWARE_ID=v3-standard-2 INSTANCE_CAP=1 NUM_EXECUTORS=4 diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg index 8800a2c8b..59e3f445f 100644 --- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=ubuntu1804-docker-2c-2g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230501-040105.925 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240101-040145.675 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg index e40681716..bc0a9dca2 100644 --- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=ubuntu1804-docker-4c-4g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230501-040105.925 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240101-040145.675 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg index 8989527b0..eb5ee8532 100644 --- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg @@ -1,3 +1,3 @@ LABELS=ubuntu1804-mininet-ovs-28-1c-4g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230501-180106.320 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230601-180106.003 HARDWARE_ID=v3-standard-2 diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index d6910bafc..80c7b2bf5 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -101,20 +101,20 @@ # CSIT configuration odl_system_count: 1 odl_system_flavor: "v3-standard-4" - odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20230727-135233.501" + odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20230801-160108.418" controller-max-mem: "2048m" openstack_system_count: 1 openstack_system_flavor: "v3-standard-4" - openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20231213-111336.211" + openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20240101-230119.558" openstack_system2_count: 0 openstack_system2_flavor: "v3-standard-2" - openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20231213-111336.211" + openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20240101-230119.558" openstack_system3_count: 1 openstack_system3_flavor: "v3-standard-8" openstack_system3_image: "ZZCI - Ubuntu 22.04 - devstack - x86_64 - 20231031-095146.118" tools_system_count: 1 tools_system_flavor: "v3-standard-2" - tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230501-180106.320" + tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230601-180106.003" openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20221101-010107.368" openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20221101-000109.537" diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 7776ee1ea..f1564609d 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -832,7 +832,7 @@ docker_system_count: "1" docker_system_flavor: "v3-standard-2" - docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20231213-111103.823" + docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20240101-220119.494" ##################### # Job Configuration # diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 486682703..971c6e1a4 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -25,7 +25,7 @@ scope: "only" # no mininet required - tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230501-040105.925" + tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240101-040145.675" # Features to install install-features: "odl-netconf-callhome-ssh,odl-restconf" diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index a6870ae3a..7f3bef1b1 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -24,7 +24,7 @@ - all: scope: "all" - tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230501-040105.925" + tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240101-040145.675" # Features to install install-features: >