2 files changed, 164 insertions, 17 deletions
diff --git a/resources/libraries/bash/function/artifacts.sh b/resources/libraries/bash/function/artifacts.sh
new file mode 100644
index 0000000000..945bdfe824
--- /dev/null
+++ b/resources/libraries/bash/function/artifacts.sh
@@ -0,0 +1,155 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2018 Cisco 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -exuo pipefail
+
+function download_artifacts () {
+    # Get and/or install VPP artifacts from packagecloud.io.
+    #
+    # Variables set:
+    # - REPO_URL - FD.io Packagecloud repository.
+
+    set -exuo pipefail
+
+    os_id=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') || {
+        die "Get OS release failed."
+    }
+
+    repo_url_path="./VPP_REPO_URL"
+    if [ -e "${repo_url_path}" ]; then
+        REPO_URL="$(<${repo_url_path})" || {
+            die "Read repo URL from ${repo_url_path} failed."
+        }
+    else
+        REPO_URL="https://packagecloud.io/install/repositories/fdio/master"
+    fi
+
+    if [ "${os_id}" == "ubuntu" ]; then
+        download_ubuntu_artifacts || die
+    elif [ "${os_id}" == "centos" ]; then
+        download_centos_artifacts || die
+    elif [ "${os_id}" == "opensuse" ]; then
+        download_opensuse_artifacts || die
+    else
+        die "${os_id} is not yet supported."
+    fi
+}
+
+function download_ubuntu_artifacts () {
+    # Get and/or install Ubuntu VPP artifacts from packagecloud.io.
+    #
+    # 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
+
+    curl -s "${REPO_URL}"/script.deb.sh | sudo bash || {
+        die "Packagecloud FD.io repo fetch failed."
+    }
+    # If version is set we will add suffix.
+    artifacts=()
+    vpp=(vpp vpp-dbg vpp-dev vpp-lib vpp-plugins)
+    if [ -z "${VPP_VERSION-}" ]; then
+        artifacts+=(${vpp[@]})
+    else
+        artifacts+=(${vpp[@]/%/=${VPP_VERSION-}})
+    fi
+    dkms=(vpp-dpdk-dkms)
+    if [ -z "${DKMS_VERSION-}" ]; then
+        artifacts+=(${dkms[@]})
+    else
+        artifacts+=(${dkms[@]/%/=${DKMS_VERSION-}})
+    fi
+
+    if [ "${INSTALL:-false}" = true ]; then
+        sudo apt-get -y install "${artifacts[@]}" || {
+            die "Install VPP artifacts failed."
+        }
+    else
+        apt-get -y download "${artifacts[@]}" || {
+            die "Download VPP artifacts failed."
+        }
+    fi
+}
+
+function download_centos_artifacts () {
+    # Get and/or install CentOS VPP artifacts from packagecloud.io.
+    #
+    # Variables read:
+    # - REPO_URL - FD.io Packagecloud repository.
+    # - VPP_VERSION - VPP version.
+    # - INSTALL - If install packages or download only. Default: download
+
+    set -exuo pipefail
+
+    curl -s "${REPO_URL}"/script.rpm.sh | sudo bash || {
+        die "Packagecloud FD.io repo fetch failed."
+    }
+    # If version is set we will add suffix.
+    artifacts=()
+    vpp=(vpp vpp-selinux-policy vpp-devel vpp-lib vpp-plugins)
+    if [ -z "${VPP_VERSION-}" ]; then
+        artifacts+=(${vpp[@]})
+    else
+        artifacts+=(${vpp[@]/%/-${VPP_VERSION-}})
+    fi
+
+    if [ "${INSTALL:-false}" = true ]; then
+        sudo yum -y install "${artifacts[@]}" || {
+            die "Install VPP artifact failed."
+        }
+    else
+        sudo yum -y install --downloadonly --downloaddir=. "${artifacts[@]}" || {
+            die "Download VPP artifacts failed."
+        }
+    fi
+}
+
+function download_opensuse_artifacts () {
+    # Get and/or install OpenSuSE VPP artifacts from packagecloud.io.
+    #
+    # Variables read:
+    # - REPO_URL - FD.io Packagecloud repository.
+    # - VPP_VERSION - VPP version.
+    # - INSTALL - If install packages or download only. Default: download
+
+    set -exuo pipefail
+
+    curl -s "${REPO_URL}"/script.rpm.sh | sudo bash || {
+        die "Packagecloud FD.io repo fetch failed."
+    }
+    # If version is set we will add suffix.
+    artifacts=()
+    vpp=(vpp vpp-devel vpp-lib vpp-plugins libvpp0)
+    if [ -z "${VPP_VERSION-}" ]; then
+        artifacts+=(${vpp[@]})
+    else
+        artifacts+=(${vpp[@]/%/-${VPP_VERSION-}})
+    fi
+
+    if [ "${INSTALL:-false}" = true ]; then
+        sudo yum -y install "${artifacts[@]}" || {
+            die "Install VPP artifact failed."
+        }
+    else
+        sudo yum -y install --downloadonly --downloaddir=. "${artifacts[@]}" || {
+            die "Download VPP artifacts failed."
+        }
+    fi
+}
+
diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh
index f490c80110..e030652494 100644
--- a/resources/libraries/bash/function/gather.sh
+++ b/resources/libraries/bash/function/gather.sh
@@ -246,6 +246,7 @@ function gather_vpp () {
     set -exuo pipefail
 
     # Variables read:
+    # - BASH_FUNCTION_DIR - Bash directory with functions.
     # - TEST_CODE - The test selection string from environment or argument.
     # - DOWNLOAD_DIR - Path to directory pybot takes the build to test from.
     # - CSIT_DIR - Path to existing root of local CSIT git repository.
@@ -267,32 +268,23 @@ function gather_vpp () {
     case "${TEST_CODE}" in
         # Not csit-vpp as this code is re-used by ligato gathering.
         "csit-"*)
-            install_script="${CSIT_DIR}/resources/tools/scripts/"
-            install_script+="download_install_vpp_pkgs.sh"
             # Use downloaded packages with specific version
             if [[ "${TEST_CODE}" == *"daily"* ]] || \
                [[ "${TEST_CODE}" == *"weekly"* ]] || \
                [[ "${TEST_CODE}" == *"timed"* ]];
             then
-                echo "Downloading latest VPP packages from NEXUS..."
-                # TODO: Can we source?
-                bash "${install_script}" --skip-install || {
-                    die "Failed to get VPP packages!"
-                }
+                warn "Downloading latest VPP packages from Packagecloud."
             else
-                echo "Downloading VPP packages of specific version from NEXUS."
-                dpdk_stable_ver="$(cat "${CSIT_DIR}/DPDK_STABLE_VER")" || {
-                    die "Cat failed."
-                }
-                vpp_stable_ver="$(cat "${CSIT_DIR}/VPP_STABLE_VER_UBUNTU")" || {
-                    die "Cat failed."
+                warn "Downloading stable VPP packages from Packagecloud."
+                DKMS_VERSION="$(<"${CSIT_DIR}/DPDK_STABLE_VER")" || {
+                    die "Read DPDK stable version failed."
                 }
-                install_args=("--skip-install" "--vpp" "${vpp_stable_ver}")
-                install_args+=("--dkms" "${dpdk_stable_ver}")
-                bash "${install_script}" "${install_args[@]}" || {
-                    die "Failed to get VPP packages!"
+                VPP_VERSION="$(<"${CSIT_DIR}/VPP_STABLE_VER_UBUNTU")" || {
+                    die "Read VPP stable version failed."
                 }
             fi
+            source "${BASH_FUNCTION_DIR}/artifacts.sh" || die "Source failed."
+            download_artifacts || die
             ;;
         "vpp-csit-"*)
             # Use local built packages.