Use package location for apt-cache show command

[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 b5bc692..518c6b4 100644 (file)
--- a/resources/libraries/bash/function/gather.sh
+++ b/resources/libraries/bash/function/gather.sh
@@ -1,4 +1,5 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2019 PANTHEON.tech and/or its affiliates.

 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:


@@ -97,9 +98,12 @@ function gather_dpdk () {
             die "Composite piped command failed."
         }
     else
             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
     fi
     # TODO: Use "wget -N" instead checking for file presence?
     if [[ ! -f "${dpdk_stable_ver}" ]]; then


@@ -166,7 +170,7 @@ function gather_ligato () {
 
     # Clone & checkout stable vpp-agent.
     cd "${CSIT_DIR}" || die "Change directory failed!"
 
     # Clone & checkout stable vpp-agent.
     cd "${CSIT_DIR}" || die "Change directory failed!"

-    git clone -b "${vpp_agent_stable_ver}" --single-branch \
+    git clone -b master --single-branch \

         "${ligato_repo_url}/vpp-agent" "vpp-agent" || {
         die "Failed to run: git clone ${ligato_repo_url}/vpp-agent!"
     }
         "${ligato_repo_url}/vpp-agent" "vpp-agent" || {
         die "Failed to run: git clone ${ligato_repo_url}/vpp-agent!"
     }


@@ -264,18 +268,16 @@ 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."

-                DKMS_VERSION="$(<"${CSIT_DIR}/DPDK_STABLE_VER")" || {
-                    die "Read DPDK stable version failed."
-                }
-                VPP_VERSION="$(<"${CSIT_DIR}/VPP_STABLE_VER_UBUNTU")" || {
+                VPP_VERSION="$(<"${CSIT_DIR}/VPP_STABLE_VER_UBUNTU_BIONIC")" || {

                     die "Read VPP stable version failed."
                 }
             fi
                     die "Read VPP stable version failed."
                 }
             fi


@@ -283,7 +285,7 @@ function gather_vpp () {
             download_artifacts || die
             ;;
         "vpp-csit-"*)
             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."
             }