diff options
| -rwxr-xr-x | docker/scripts/dbld_vpp_install_packages.sh | 37 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg | 1 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 5 | ||||
| -rw-r--r-- | nodepool/nodepool.yaml | 4 |
4 files changed, 24 insertions, 23 deletions
diff --git a/docker/scripts/dbld_vpp_install_packages.sh b/docker/scripts/dbld_vpp_install_packages.sh index e0d1f27f7..707096b45 100755 --- a/docker/scripts/dbld_vpp_install_packages.sh +++ b/docker/scripts/dbld_vpp_install_packages.sh @@ -39,11 +39,8 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do make_vpp "install-dep" "$branch" make_vpp "centos-pyyaml" "$branch" # VPP Makefile tests for centos versions if [ "$OS_ID" = "ubuntu" ] ; then - # TODO: fix VPP stable/2005 bug in sphinx-make.sh - # which fails on 'yum install python3-venv' - # that does not exist. # 'Make docs jobs are only run on ubuntu executors - # so only run for ubuntu build executors until fixed. + # so only run for ubuntu build executors. make_vpp "docs-venv" "$branch" elif [ "$OS_NAME" = "debian-9" ] ; then apt_override_cmake_install_with_pip3_version @@ -51,16 +48,30 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do # Download, build, and cache external deps packages make_vpp "install-ext-deps" "$branch" - set +e vpp_ext_dir="$DOCKER_VPP_DIR/build/external" - [ -d "$vpp_ext_dir/downloads" ] \ - && rsync -ac "$vpp_ext_dir/downloads/." "$DOCKER_DOWNLOADS_DIR" - [ -n "$(ls $vpp_ext_dir/*.deb)" ] \ - && rsync -ac "$vpp_ext_dir/*.deb" "$DOCKER_DOWNLOADS_DIR" - [ -n "$(ls $vpp_ext_dir/*.rpm)" ] \ - && rsync -ac "$vpp_ext_dir/*.rpm" "$DOCKER_DOWNLOADS_DIR" - set -e - + rsync -ac $vpp_ext_dir/downloads/. $DOCKER_DOWNLOADS_DIR || true + if which apt >/dev/null ; then + vpp_ext_deps_pkg=$vpp_ext_dir/$(dpkg -l vpp-ext-deps 2>/dev/null | mawk '/vpp-ext-deps/{print $2"_"$3"_"$4".deb"}') + elif which dnf >/dev/null ; then + inst_vpp_ext_deps="$(dnf list vpp-ext-deps 2>/dev/null | grep vpp-ext-deps)" + vpp_ext_deps_ver="$(echo $inst_vpp_ext_deps | mawk '{print $2}')" + vpp_ext_deps_arch="$(echo $inst_vpp_ext_deps | mawk '{print $1}'| cut -d'.' -f2)" + vpp_ext_deps_pkg="$vpp_ext_dir/vpp-ext-deps-${vpp_ext_deps_ver}.${vpp_ext_deps_arch}.rpm" + elif which yum >/dev/null ; then + inst_vpp_ext_deps="$(yum list vpp-ext-deps 2>/dev/null | grep vpp-ext-deps)" + vpp_ext_deps_ver="$(echo $inst_vpp_ext_deps | mawk '{print $2}')" + vpp_ext_deps_arch="$(echo $inst_vpp_ext_deps | mawk '{print $1}' | cut -d'.' -f2)" + vpp_ext_deps_pkg="$vpp_ext_dir/vpp-ext-deps-${vpp_ext_deps_ver}.${vpp_ext_deps_arch}.rpm" + else + echo "ERROR: Package Manager not installed!" + exit 1 + fi + if [ -f "$vpp_ext_deps_pkg" ] ; then + cp -f $vpp_ext_deps_pkg $DOCKER_DOWNLOADS_DIR + else + echo "ERROR: Missing VPP external deps package: '$vpp_ext_deps_pkg'" + exit 1 + fi # Install/cache python packages if [ "$OS_ID" = "ubuntu" ] ; then make_vpp_test "test-dep" "$branch" diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index 80e19418e..da74aff20 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -15,7 +15,6 @@ 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/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 219b0b90c..68788c781 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -245,11 +245,6 @@ os: 'centos8' - stream: '2009' os: 'ubuntu2004' - # OS introduced after 2101 - - stream: '2101' - os: 'centos8' - - stream: '2101' - os: 'ubuntu2004' # [end] VPP-AARCH64 PROJECT # VPP-CSIT-VERIFY-DEVICE PROJECT diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 408cfc168..5af2443e7 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -28,8 +28,6 @@ providers: - name: 'verify-merge' cloud: vexxhost max-servers: 10 - availability-zones: - - 'ca-ymq-2' template-hostname: 'np-verify-merge-{timestamp}-nodepool-template' keypair: 'jenkins' networks: @@ -46,8 +44,6 @@ providers: - name: 'multilink' cloud: vexxhost max-servers: 16 - availability-zones: - - 'ca-ymq-2' template-hostname: 'np-multi-link-{timestamp}-nodepool-template' keypair: 'jenkins' networks: |