Bump DPDK to 19.02

[csit.git] / resources / libraries / bash / function / gather.sh

diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh
index 1d00f6b..28a84ca 100644 (file)
--- a/resources/libraries/bash/function/gather.sh
+++ b/resources/libraries/bash/function/gather.sh
@@ -99,7 +99,7 @@ function gather_dpdk () {
     else
         echo "Downloading DPDK packages of specific version from repo..."
         # TODO: Can we autodetect this based on what CSIT-stable VPP uses?
     else
         echo "Downloading DPDK packages of specific version from repo..."
         # TODO: Can we autodetect this based on what CSIT-stable VPP uses?

-        dpdk_stable_ver="dpdk-18.08.tar.xz"
+        dpdk_stable_ver="dpdk-19.02.tar.xz"

     fi
     # TODO: Use "wget -N" instead checking for file presence?
     if [[ ! -f "${dpdk_stable_ver}" ]]; then
     fi
     # TODO: Use "wget -N" instead checking for file presence?
     if [[ ! -f "${dpdk_stable_ver}" ]]; then


@@ -264,23 +264,31 @@ function gather_vpp () {
     case "${TEST_CODE}" in
         # Not csit-vpp as this code is re-used by ligato gathering.
         "csit-"*)
     case "${TEST_CODE}" in
         # Not csit-vpp as this code is re-used by ligato gathering.
         "csit-"*)

-            # Use downloaded packages with specific version
+            # Use downloaded packages with specific version.

             if [[ "${TEST_CODE}" == *"daily"* ]] || \
             if [[ "${TEST_CODE}" == *"daily"* ]] || \

-               [[ "${TEST_CODE}" == *"weekly"* ]] || \
-               [[ "${TEST_CODE}" == *"timed"* ]];
+               ([[ "${TEST_CODE}" == *"weekly"* ]] && \
+                [[ "${TEST_CODE}" != *"device"* ]]) || \
+               [[ "${TEST_CODE}" == *"semiweekly"* ]];

             then
                 warn "Downloading latest VPP packages from Packagecloud."
             else
                 warn "Downloading stable VPP packages from Packagecloud."
             then
                 warn "Downloading latest VPP packages from Packagecloud."
             else
                 warn "Downloading stable VPP packages from Packagecloud."

-                VPP_VERSION="$(<"${CSIT_DIR}/VPP_STABLE_VER_UBUNTU")" || {
-                    die "Read VPP stable version failed."
-                }
+                if [[ "${TEST_CODE}" == *"device"* ]];
+                then
+                    VPP_VERSION="$(<"${CSIT_DIR}/VPP_STABLE_VER_UBUNTU_BIONIC")" || {
+                        die "Read VPP stable version failed."
+                    }
+                else
+                    VPP_VERSION="$(<"${CSIT_DIR}/VPP_STABLE_VER_UBUNTU")" || {
+                        die "Read VPP stable version failed."
+                    }
+                fi

             fi
             source "${BASH_FUNCTION_DIR}/artifacts.sh" || die "Source failed."
             download_artifacts || die
             ;;
         "vpp-csit-"*)
             fi
             source "${BASH_FUNCTION_DIR}/artifacts.sh" || die "Source failed."
             download_artifacts || die
             ;;
         "vpp-csit-"*)

-            # Use local built packages.
+            # Use locally built packages.

             mv "${DOWNLOAD_DIR}"/../"vpp"*".deb" "${DOWNLOAD_DIR}"/ || {
                 die "Move command failed."
             }
             mv "${DOWNLOAD_DIR}"/../"vpp"*".deb" "${DOWNLOAD_DIR}"/ || {
                 die "Move command failed."
             }