diff options
author | Dave Wallace <dwallacelf@gmail.com> | 2024-04-11 21:28:31 -0400 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2024-05-29 19:34:40 +0000 |
commit | 80a84ddeab26971d7437ac43116e91dbe625a78f (patch) | |
tree | 146fe41e8f376bf2c727891897cd337d3f0052bc /docker/scripts/dbld_vpp_install_packages.sh | |
parent | 46ef3a65ffcb6e56ec3d68d769e72e2d0c4f59f0 (diff) |
vpp-hst: add VPP HostStack Test framework jobs
- add hst and hst-debug per-patch vpp verify jobs
- reduce idle termination time to 1 minute
- fix vpp script permissions to 755 so all are the same
- use docker-in-docker base image for ubuntu-22.04 containers
Change-Id: I10396c823fbeaa5e081e48332509e0c20b31b87c
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'docker/scripts/dbld_vpp_install_packages.sh')
-rwxr-xr-x | docker/scripts/dbld_vpp_install_packages.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/docker/scripts/dbld_vpp_install_packages.sh b/docker/scripts/dbld_vpp_install_packages.sh index 5e1e0f8f0..fecd823dd 100755 --- a/docker/scripts/dbld_vpp_install_packages.sh +++ b/docker/scripts/dbld_vpp_install_packages.sh @@ -1,6 +1,6 @@ #! /bin/bash -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -15,7 +15,7 @@ set -euxo pipefail -export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"} +export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname "${BASH_SOURCE[0]}")"} . "$CIMAN_DOCKER_SCRIPTS/lib_vpp.sh" . "$CIMAN_DOCKER_SCRIPTS/lib_apt.sh" @@ -23,18 +23,23 @@ must_be_run_in_docker_build echo_log if ! vpp_supported_executor_class "$FDIOTOOLS_EXECUTOR_CLASS" ; then - echo_log "VPP is not supported on executor class '$FDIOTOOLS_EXECUTOR_CLASS'. Skipping $(basename $0)..." + echo_log "VPP is not supported on executor class '$FDIOTOOLS_EXECUTOR_CLASS'. Skipping $(basename "$0")..." exit 0 else - echo_log "Starting $(basename $0)" + echo_log "Starting $(basename "$0")" fi do_git_config vpp for branch in ${VPP_BRANCHES[$OS_NAME]} ; do do_git_branch "$branch" + # Install hs-test depndencies + if [ "$OS_NAME" = "ubuntu-22.04" ] && [ "$branch" = "master" ] ; then + install_hst_deps "$branch" + fi + # Install OS packages - make_vpp "install-dep" "$branch" + make_vpp "install-deps" "$branch" # Download, build, and cache external deps packages make_vpp "install-ext-deps" "$branch" @@ -47,7 +52,7 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do exit 1 fi if [ -f "$vpp_ext_deps_pkg" ] ; then - cp -f $vpp_ext_deps_pkg $DOCKER_DOWNLOADS_DIR + cp -f "$vpp_ext_deps_pkg" $DOCKER_DOWNLOADS_DIR else echo "ERROR: Missing VPP external deps package: '$vpp_ext_deps_pkg'" exit 1 @@ -76,4 +81,4 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do esac done -echo_log -e "Completed $(basename $0)!\n\n==========" +echo_log -e "Completed $(basename "$0")!\n\n==========" |