aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DPDK_STABLE_VER1
-rw-r--r--bootstrap-vpp-verify-weekly.sh1
-rwxr-xr-xbootstrap.sh1
-rw-r--r--resources/libraries/bash/function/artifacts.sh7
-rw-r--r--resources/libraries/bash/function/gather.sh3
-rw-r--r--resources/libraries/bash/function/per_patch.sh9
-rw-r--r--tests/vpp/perf/__init__.robot2
7 files changed, 3 insertions, 21 deletions
diff --git a/DPDK_STABLE_VER b/DPDK_STABLE_VER
deleted file mode 100644
index 83be9a25f9..0000000000
--- a/DPDK_STABLE_VER
+++ /dev/null
@@ -1 +0,0 @@
-19.01-2 \ No newline at end of file
diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh
index feced87411..6f5ae6fbe2 100644
--- a/bootstrap-vpp-verify-weekly.sh
+++ b/bootstrap-vpp-verify-weekly.sh
@@ -59,7 +59,6 @@ if [ "${#}" -ne "0" ]; then
echo ${arr[0]}
else
# Download the specific VPP build install packages
- DKMS_VERSION=$(< ${SCRIPT_DIR}/DPDK_STABLE_VER)
VPP_VERSION=$(< ${SCRIPT_DIR}/VPP_STABLE_VER_${DISTRO})
CSIT_DIR=${SCRIPT_DIR}
source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh"
diff --git a/bootstrap.sh b/bootstrap.sh
index d37f704aa1..03d7effc46 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -44,7 +44,6 @@ if [ "${#}" -ne "0" ]; then
echo ${arr[0]}
SKIP_PATCH="skip_patchORskip_vpp_patch"
else
- DKMS_VERSION=$(< ${SCRIPT_DIR}/DPDK_STABLE_VER)
VPP_VERSION=$(< ${SCRIPT_DIR}/VPP_STABLE_VER_${DISTRO})
CSIT_DIR=${SCRIPT_DIR}
source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh"
diff --git a/resources/libraries/bash/function/artifacts.sh b/resources/libraries/bash/function/artifacts.sh
index 5ead2980b7..abb0b5f428 100644
--- a/resources/libraries/bash/function/artifacts.sh
+++ b/resources/libraries/bash/function/artifacts.sh
@@ -55,7 +55,6 @@ function download_ubuntu_artifacts () {
# Variables read:
# - REPO_URL - FD.io Packagecloud repository.
# - VPP_VERSION - VPP version.
- # - DKMS_VERSION - DKMS version.
# - INSTALL - If install packages or download only. Default: download
set -exuo pipefail
@@ -71,12 +70,6 @@ function download_ubuntu_artifacts () {
else
artifacts+=(${vpp[@]/%/=${VPP_VERSION-}})
fi
- dkms=(vpp-ext-deps)
- if [ -z "${DKMS_VERSION-}" ]; then
- artifacts+=(${dkms[@]})
- else
- artifacts+=(${dkms[@]/%/=${DKMS_VERSION-}})
- fi
if [ "${INSTALL:-false}" = true ]; then
sudo apt-get -y install "${artifacts[@]}" || {
diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh
index b5bc692955..d5c294a4b5 100644
--- a/resources/libraries/bash/function/gather.sh
+++ b/resources/libraries/bash/function/gather.sh
@@ -272,9 +272,6 @@ function gather_vpp () {
warn "Downloading latest VPP packages from Packagecloud."
else
warn "Downloading stable VPP packages from Packagecloud."
- DKMS_VERSION="$(<"${CSIT_DIR}/DPDK_STABLE_VER")" || {
- die "Read DPDK stable version failed."
- }
VPP_VERSION="$(<"${CSIT_DIR}/VPP_STABLE_VER_UBUNTU")" || {
die "Read VPP stable version failed."
}
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."
diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot
index 182aaa45a2..bba10eb831 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-ext-deps
+| | ... | vpp-plugins
| | Set Global Variable | ${vpp_deb_pkgs}