X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fper_patch.sh;h=abf2cac6884755d669ea36f3c1ba511641e1e2f3;hb=91ff7a3f99ecb6e1e849bb9ee0b58b22d0be0b5a;hp=61de6f7ade71632fca3cca987628e377f418feaf;hpb=36d56bdb7f9f394047e2df3f29bf47db877b649c;p=csit.git diff --git a/resources/libraries/bash/function/per_patch.sh b/resources/libraries/bash/function/per_patch.sh index 61de6f7ade..abf2cac688 100644 --- a/resources/libraries/bash/function/per_patch.sh +++ b/resources/libraries/bash/function/per_patch.sh @@ -66,7 +66,7 @@ function archive_parse_test_results () { function build_vpp_ubuntu_amd64 () { - # This function is using Vagrant script to build VPP with all dependencies + # This function is using make pkg-verify to build VPP with all dependencies # that is ARCH/OS aware. VPP repo is SSOT for building mechanics and CSIT # is consuming artifacts. This way if VPP will introduce change in building # mechanics they will not be blocked by CSIT repo. @@ -82,13 +82,10 @@ function build_vpp_ubuntu_amd64 () { set -exuo pipefail cd "${VPP_DIR}" || die "Change directory command failed." - echo 'Building using "make build-root/vagrant/build.sh"' - build-root/vagrant/"build.sh" || die "Vagrant VPP build script failed." - echo "*******************************************************************" + make UNATTENDED=y pkg-verify || die "VPP build using make pkg-verify failed." echo "* VPP ${1-} BUILD SUCCESSFULLY COMPLETED" || { die "Argument not found." } - echo "*******************************************************************" } @@ -112,10 +109,7 @@ function compare_test_results () { cd "${VPP_DIR}" || die "Change directory operation failed." # Reusing CSIT main virtualenv. - pip install -r "${PYTHON_SCRIPTS_DIR}/perpatch_requirements.txt" || { - die "Perpatch Python requirements installation failed." - } - python "${PYTHON_SCRIPTS_DIR}/compare_perpatch.py" + python3 "${TOOLS_DIR}/integrated/compare_perpatch.py" # The exit code determines the vote result. }