X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fper_patch.sh;h=854392eca6b11de884d5cc8470b1652636ec93ae;hp=244b6f448ce92adec91db4eb7a0e600694f1bebe;hb=f3e74e6b21a5d5568f4bd1357222e8a014d8397c;hpb=3bb7803c9e74d4ceeac77480c11e01d5d8d7d589 diff --git a/resources/libraries/bash/function/per_patch.sh b/resources/libraries/bash/function/per_patch.sh index 244b6f448c..854392eca6 100644 --- a/resources/libraries/bash/function/per_patch.sh +++ b/resources/libraries/bash/function/per_patch.sh @@ -75,9 +75,9 @@ function build_vpp_ubuntu_amd64 () { # then for its parent commit. On Jenkins, no dpdk is installed at first, # locally it might have been installed. New dpdk is installed second call. # If make detects installed vpp-ext-deps with matching version, - # it skips building vpp-ext-deps entirely, but we need that file. + # it skips building vpp-ext-deps entirely. # On the other hand, if parent uses different dpdk version, - # The new vpp-ext-deps is built, but the old one is not removed + # the new vpp-ext-deps is built, but the old one is not removed # from the build directory if present. (Further functions move both, # and during test dpkg would decide randomly which version gets installed.) # As per_patch is too dumb (yet) to detect any of that, @@ -94,11 +94,6 @@ function build_vpp_ubuntu_amd64 () { die "Make install-ext-deps failed." } build-root/vagrant/"build.sh" || die "Vagrant VPP build script failed." - # CSIT also needs the external dependency artifacts, which is not in - # build-root. - mv -v "build/external/vpp-ext-deps"*".deb" "build-root"/ || { - die "*.deb move failed." - } echo "*******************************************************************" echo "* VPP ${1-} BUILD SUCCESSFULLY COMPLETED" || { die "Argument not found."