diff options
| -rw-r--r-- | VPP_REPO_URL | 2 | ||||
| -rw-r--r-- | VPP_STABLE_VER_CENTOS | 2 | ||||
| -rw-r--r-- | VPP_STABLE_VER_UBUNTU_BIONIC | 2 | ||||
| -rw-r--r-- | resources/libraries/bash/function/artifacts.sh | 13 |
4 files changed, 11 insertions, 8 deletions
diff --git a/VPP_REPO_URL b/VPP_REPO_URL index 2d0237d3e7..dd85a09321 100644 --- a/VPP_REPO_URL +++ b/VPP_REPO_URL @@ -1 +1 @@ -https://packagecloud.io/install/repositories/fdio/2001 +https://packagecloud.io/install/repositories/fdio/release diff --git a/VPP_STABLE_VER_CENTOS b/VPP_STABLE_VER_CENTOS index 8454b7e6ff..0da4ea147f 100644 --- a/VPP_STABLE_VER_CENTOS +++ b/VPP_STABLE_VER_CENTOS @@ -1 +1 @@ -20.01-rc2~3_g9af7a98~b8 +20.01-release diff --git a/VPP_STABLE_VER_UBUNTU_BIONIC b/VPP_STABLE_VER_UBUNTU_BIONIC index 7a6573dfc7..0da4ea147f 100644 --- a/VPP_STABLE_VER_UBUNTU_BIONIC +++ b/VPP_STABLE_VER_UBUNTU_BIONIC @@ -1 +1 @@ -20.01-rc2~3-g9af7a98cf +20.01-release diff --git a/resources/libraries/bash/function/artifacts.sh b/resources/libraries/bash/function/artifacts.sh index 35fade98af..f51d5357b7 100644 --- a/resources/libraries/bash/function/artifacts.sh +++ b/resources/libraries/bash/function/artifacts.sh @@ -104,11 +104,14 @@ function download_ubuntu_artifacts () { set +x for package in ${packages}; do # Filter packages with given version - pkg_info=$(apt-cache show ${package}) || { - die "apt-cache show on ${package} failed." - } - ver=$(echo ${pkg_info} | grep -o "Version: ${VPP_VERSION-}[^ ]*" | \ - head -1) || true + # Workaround for corrupted fdio_release.list + if [[ "${package}" != "-dev" ]]; then + pkg_info=$(apt-cache show ${package}) || { + die "apt-cache show on ${package} failed." + } + ver=$(echo ${pkg_info} | grep -o "Version: ${VPP_VERSION-}[^ ]*" | \ + head -1) || true + fi if [ -n "${ver-}" ]; then echo "Found '${VPP_VERSION-}' among '${package}' versions." ver=$(echo "$ver" | cut -d " " -f 2) |