diff options
| -rw-r--r-- | DPDK_STABLE_VER | 2 | ||||
| -rw-r--r-- | resources/libraries/bash/function/artifacts.sh | 2 | ||||
| -rw-r--r-- | resources/libraries/bash/function/per_patch.sh | 21 | ||||
| -rw-r--r-- | tests/vpp/perf/__init__.robot | 2 |
4 files changed, 14 insertions, 13 deletions
diff --git a/DPDK_STABLE_VER b/DPDK_STABLE_VER index f4d3fed5d1..8f1463621a 100644 --- a/DPDK_STABLE_VER +++ b/DPDK_STABLE_VER @@ -1 +1 @@ -18.08-vpp3
\ No newline at end of file +18.10-5
\ No newline at end of file diff --git a/resources/libraries/bash/function/artifacts.sh b/resources/libraries/bash/function/artifacts.sh index 945bdfe824..07a04c4b73 100644 --- a/resources/libraries/bash/function/artifacts.sh +++ b/resources/libraries/bash/function/artifacts.sh @@ -69,7 +69,7 @@ function download_ubuntu_artifacts () { else artifacts+=(${vpp[@]/%/=${VPP_VERSION-}}) fi - dkms=(vpp-dpdk-dkms) + dkms=(vpp-ext-deps) if [ -z "${DKMS_VERSION-}" ]; then artifacts+=(${dkms[@]}) else diff --git a/resources/libraries/bash/function/per_patch.sh b/resources/libraries/bash/function/per_patch.sh index 15eaf028ee..4353a5e1a5 100644 --- a/resources/libraries/bash/function/per_patch.sh +++ b/resources/libraries/bash/function/per_patch.sh @@ -45,28 +45,29 @@ function build_vpp_ubuntu_amd64 () { # The per_patch script calls this function twice, first for the new commit, # 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-dpdk-dev with matching version, - # it skips building vpp-dpdk-dkms entirely, but we need that file. + # If make detects installed vpp-ext-deps with matching version, + # it skips building vpp-ext-deps entirely, but we need that file. # On the other hand, if parent uses different dpdk version, - # The new vpp-dpdk-dkms 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 decides on its own which version gets installed.) # As per_patch is too dumb (yet) to detect any of that, # the only safe solution is to clean build directory and force rebuild. # TODO: Make this function smarter and skip DPDK rebuilds if possible. - cmd=("dpkg-query" "--showformat='$${Version}'" "--show" "vpp-dpdk-dev") + cmd=("dpkg-query" "--showformat='$${Version}'" "--show" "vpp-ext-deps") installed_deb_ver="$(sudo "${cmd[@]}" || true)" if [[ -n "${installed_deb_ver}" ]]; then - sudo dpkg --purge "vpp-dpdk-dev" || { - die "Dpdk package uninstalation failed." + sudo dpkg --purge "vpp-ext-deps" || { + die "DPDK package uninstalation failed." } fi - make UNATTENDED=yes dpdk-install-dev || { - die "Make dpdk-install-dev failed." + make UNATTENDED=yes install-ext-deps || { + die "Make install-ext-deps failed." } build-root/vagrant/"build.sh" || die "Vagrant VPP build script failed." - # CSIT also needs the DPDK artifacts, which is not in build-root. - mv -v "dpdk/vpp-dpdk-dkms"*".deb" "build-root"/ || { + # 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." } diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot index 0578839c3a..182aaa45a2 100644 --- a/tests/vpp/perf/__init__.robot +++ b/tests/vpp/perf/__init__.robot @@ -60,5 +60,5 @@ | | @{vpp_rpm_pkgs}= | Create List | vpp | vpp-devel | vpp-lib | vpp-plugins | | Set Global Variable | ${vpp_rpm_pkgs} | | @{vpp_deb_pkgs}= | Create List | vpp | vpp-dbg | vpp-dev | vpp-lib -| | ... | vpp-plugins | vpp-dpdk-dkms +| | ... | vpp-plugins | vpp-ext-deps | | Set Global Variable | ${vpp_deb_pkgs} |