X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fscripts%2Fdownload_hc_build_pkgs.sh;h=6b595a47527407b6c7df4ccf13c30eb1a108c954;hp=c534b65aa08c6ec310c0dc0cb9cff2d2a33046a1;hb=20cc67d5f23a7f4e05b08012bf3d3a63be4bcf63;hpb=6c295bd3d177d42343bfed4596655ce6604e0e55 diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh index c534b65aa0..6b595a4752 100755 --- a/resources/tools/scripts/download_hc_build_pkgs.sh +++ b/resources/tools/scripts/download_hc_build_pkgs.sh @@ -37,13 +37,13 @@ JVPP_VERSION=`../jvpp-version` if [[ -n "${jvpp_commit_id}" ]]; then # Skipping download of JVPP because it was built from source - VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-dev libvppinfra-dev" - VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-dev" - VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-devel" + VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-dev libvppinfra-dev vpp-api-python" + VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-dev vpp-api-python" + VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-devel vpp-api-python" else - VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-api-java" - VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java" - VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java" + VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-api-java vpp-api-python" + VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java vpp-api-python" + VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java vpp-api-python" fi IGNORE_DEPS="" @@ -138,7 +138,7 @@ if [[ -n "${jvpp_commit_id}" ]]; then if [[ "$ID" == "centos" ]]; then sudo yum remove "*vpp*" else - sudo apt remove "*vpp*" + sudo apt -y remove "*vpp*" fi rm -rf jvpp_src fi @@ -169,7 +169,7 @@ done if [[ "${OS}" == "centos7" ]]; then sudo yum remove "*vpp-api-java*" else - sudo apt remove "*vpp-api-java*" + sudo apt -y remove "*vpp-api-java*" fi cd ${current_dir}