CSIT-1419 Convert vpp-virl job to vpp-device

[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 bdcf1c4..b169445 100644 (file)
--- a/resources/libraries/bash/function/gather.sh
+++ b/resources/libraries/bash/function/gather.sh
@@ -97,9 +97,12 @@ function gather_dpdk () {
             die "Composite piped command failed."
         }
     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"
+        echo "Downloading DPDK package of specific version from repo ..."
+        # Downloading DPDK version based on what VPP is using. Currently
+        # it is not easy way to detect from VPP version automatically.
+        dpdk_stable_ver="$(< "${CSIT_DIR}/DPDK_VPP_VER")".tar.xz || {
+            die "Failed to read DPDK VPP version!"
+        }
     fi
     # TODO: Use "wget -N" instead checking for file presence?
     if [[ ! -f "${dpdk_stable_ver}" ]]; then
@@ -264,10 +267,11 @@ function gather_vpp () {
     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"* ]] || \
-               [[ "${TEST_CODE}" == *"weekly"* ]] || \
-               [[ "${TEST_CODE}" == *"timed"* ]];
+               ([[ "${TEST_CODE}" == *"weekly"* ]] && \
+                [[ "${TEST_CODE}" != *"device"* ]]) || \
+               [[ "${TEST_CODE}" == *"semiweekly"* ]];
             then
                 warn "Downloading latest VPP packages from Packagecloud."
             else
@@ -287,7 +291,7 @@ function gather_vpp () {
             download_artifacts || die
             ;;
         "vpp-csit-"*)
-            # Use local built packages.
+            # Use locally built packages.
             mv "${DOWNLOAD_DIR}"/../"vpp"*".deb" "${DOWNLOAD_DIR}"/ || {
                 die "Move command failed."
             }