Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bash: tolerate -dev as a package name
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
artifacts.sh
diff --git
a/resources/libraries/bash/function/artifacts.sh
b/resources/libraries/bash/function/artifacts.sh
index
fe300d1
..
426782d
100644
(file)
--- a/
resources/libraries/bash/function/artifacts.sh
+++ b/
resources/libraries/bash/function/artifacts.sh
@@
-1,6
+1,6
@@
#!/usr/bin/env bash
#!/usr/bin/env bash
-# Copyright (c) 20
19
Cisco and/or its affiliates.
+# Copyright (c) 20
20
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.
# 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.
@@
-17,12
+17,17
@@
set -exuo pipefail
function download_artifacts () {
set -exuo pipefail
function download_artifacts () {
- # Get and/or install VPP artifacts from packagecloud.io.
+
+ # Download or install VPP artifacts from packagecloud.io.
#
# Variables read:
# - CSIT_DIR - Path to existing root of local CSIT git repository.
# Variables set:
# - REPO_URL - FD.io Packagecloud repository.
#
# Variables read:
# - CSIT_DIR - Path to existing root of local CSIT git repository.
# Variables set:
# - REPO_URL - FD.io Packagecloud repository.
+ # Functions conditionally called (see their documentation for side effects):
+ # - download_ubuntu_artifacts
+ # - download_centos_artifacts
+ # - download_opensuse_artifacts
set -exuo pipefail
set -exuo pipefail
@@
-51,16
+56,18
@@
function download_artifacts () {
}
function download_ubuntu_artifacts () {
}
function download_ubuntu_artifacts () {
- # Get and/or install Ubuntu VPP artifacts from packagecloud.io.
+
+ # Download or install Ubuntu VPP artifacts from packagecloud.io.
#
# Variables read:
# - REPO_URL - FD.io Packagecloud repository.
# - VPP_VERSION - VPP version.
#
# Variables read:
# - REPO_URL - FD.io Packagecloud repository.
# - VPP_VERSION - VPP version.
- # - INSTALL - If install packages or download only. Default: download
+ # - INSTALL - Whether install packages (if set to "true") or download only.
+ # Default: "false".
set -exuo pipefail
set -exuo pipefail
- curl -s "${REPO_URL}"/script.deb.sh | sudo bash || {
+ curl -s "${REPO_URL}"/script.deb.sh | sudo
-E
bash || {
die "Packagecloud FD.io repo fetch failed."
}
# If version is set we will add suffix.
die "Packagecloud FD.io repo fetch failed."
}
# If version is set we will add suffix.
@@
-86,7
+93,9
@@
function download_ubuntu_artifacts () {
}
if [ -z "${VPP_VERSION-}" ]; then
# If version is not specified, find out the most recent version
}
if [ -z "${VPP_VERSION-}" ]; then
# If version is not specified, find out the most recent version
- VPP_VERSION=$(apt-cache --no-all-versions show vpp | grep Version: | \
+ VPP_VERSION=$(apt-cache -o Dir::Etc::SourceList=${apt_fdio_repo_file} \
+ -o Dir::Etc::SourceParts=${apt_fdio_repo_file} \
+ --no-all-versions show vpp | grep Version: | \
cut -d " " -f 2) || {
die "Retrieval of most recent VPP version failed."
}
cut -d " " -f 2) || {
die "Retrieval of most recent VPP version failed."
}
@@
-95,7
+104,7
@@
function download_ubuntu_artifacts () {
set +x
for package in ${packages}; do
# Filter packages with given version
set +x
for package in ${packages}; do
# Filter packages with given version
- pkg_info=$(apt-cache show ${package}) || {
+ pkg_info=$(apt-cache show
--
${package}) || {
die "apt-cache show on ${package} failed."
}
ver=$(echo ${pkg_info} | grep -o "Version: ${VPP_VERSION-}[^ ]*" | \
die "apt-cache show on ${package} failed."
}
ver=$(echo ${pkg_info} | grep -o "Version: ${VPP_VERSION-}[^ ]*" | \
@@
-110,7
+119,7
@@
function download_ubuntu_artifacts () {
done
set -x
done
set -x
- if [
"${INSTALL:-false}" = true
]; then
+ if [
[ "${INSTALL:-false}" == "true" ]
]; then
sudo apt-get -y install "${artifacts[@]}" || {
die "Install VPP artifacts failed."
}
sudo apt-get -y install "${artifacts[@]}" || {
die "Install VPP artifacts failed."
}
@@
-122,16
+131,18
@@
function download_ubuntu_artifacts () {
}
function download_centos_artifacts () {
}
function download_centos_artifacts () {
- # Get and/or install CentOS VPP artifacts from packagecloud.io.
+
+ # Download or install CentOS VPP artifacts from packagecloud.io.
#
# Variables read:
# - REPO_URL - FD.io Packagecloud repository.
# - VPP_VERSION - VPP version.
#
# Variables read:
# - REPO_URL - FD.io Packagecloud repository.
# - VPP_VERSION - VPP version.
- # - INSTALL - If install packages or download only. Default: download
+ # - INSTALL - Whether install packages (if set to "true") or download only.
+ # Default: "false".
set -exuo pipefail
set -exuo pipefail
- curl -s "${REPO_URL}"/script.rpm.sh | sudo bash || {
+ curl -s "${REPO_URL}"/script.rpm.sh | sudo
-E
bash || {
die "Packagecloud FD.io repo fetch failed."
}
# If version is set we will add suffix.
die "Packagecloud FD.io repo fetch failed."
}
# If version is set we will add suffix.
@@
-143,7
+154,7
@@
function download_centos_artifacts () {
artifacts+=(${packages[@]/%/-${VPP_VERSION-}})
fi
artifacts+=(${packages[@]/%/-${VPP_VERSION-}})
fi
- if [
"${INSTALL:-false}" = true
]; then
+ if [
[ "${INSTALL:-false}" == "true" ]
]; then
sudo yum -y install "${artifacts[@]}" || {
die "Install VPP artifact failed."
}
sudo yum -y install "${artifacts[@]}" || {
die "Install VPP artifact failed."
}
@@
-155,16
+166,18
@@
function download_centos_artifacts () {
}
function download_opensuse_artifacts () {
}
function download_opensuse_artifacts () {
- # Get and/or install OpenSuSE VPP artifacts from packagecloud.io.
+
+ # Download or install OpenSuSE VPP artifacts from packagecloud.io.
#
# Variables read:
# - REPO_URL - FD.io Packagecloud repository.
# - VPP_VERSION - VPP version.
#
# Variables read:
# - REPO_URL - FD.io Packagecloud repository.
# - VPP_VERSION - VPP version.
- # - INSTALL - If install packages or download only. Default: download
+ # - INSTALL - Whether install packages (if set to "true") or download only.
+ # Default: "false".
set -exuo pipefail
set -exuo pipefail
- curl -s "${REPO_URL}"/script.rpm.sh | sudo bash || {
+ curl -s "${REPO_URL}"/script.rpm.sh | sudo
-E
bash || {
die "Packagecloud FD.io repo fetch failed."
}
# If version is set we will add suffix.
die "Packagecloud FD.io repo fetch failed."
}
# If version is set we will add suffix.
@@
-176,7
+189,7
@@
function download_opensuse_artifacts () {
artifacts+=(${packages[@]/%/-${VPP_VERSION-}})
fi
artifacts+=(${packages[@]/%/-${VPP_VERSION-}})
fi
- if [
"${INSTALL:-false}" = true
]; then
+ if [
[ "${INSTALL:-false}" == "true" ]
]; then
sudo yum -y install "${artifacts[@]}" || {
die "Install VPP artifact failed."
}
sudo yum -y install "${artifacts[@]}" || {
die "Install VPP artifact failed."
}