diff options
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 2 | ||||
| m--------- | global-jjb | 0 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh index 491b75f5..12e5abd1 100644 --- a/docker/scripts/lib_vpp.sh +++ b/docker/scripts/lib_vpp.sh @@ -101,6 +101,6 @@ docker_build_setup_vpp() { declare -A VPP_BRANCHES VPP_BRANCHES["centos-8"]="stable/2106 stable/2110 master" VPP_BRANCHES["debian-10"]="stable/2106 stable/2110 master" -VPP_BRANCHES["ubuntu-18.04"]="stable/2106 stable/2110 master" +VPP_BRANCHES["ubuntu-18.04"]="stable/2106 stable/2110" VPP_BRANCHES["ubuntu-20.04"]="stable/2106 stable/2110 master" export VPP_BRANCHES diff --git a/global-jjb b/global-jjb -Subproject 28c06872f86a6d432e89ab4923bb807145e3aef +Subproject 24d80c063923fc2ae4e76a5797ae471601c1856 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index 3535b2da..0a3ae6ea 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -7,7 +7,6 @@ OS_CLOUD=vexci # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210930-221429.769 -VOLUME_SIZE=20 HARDWARE_ID=v3-standard-2 NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03 USER_DATA_ID=jenkins-init-system |