Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
doc: fixing documentation structure
[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
fc9c886
..
15a4dd2
100644
(file)
--- a/
resources/libraries/bash/function/artifacts.sh
+++ b/
resources/libraries/bash/function/artifacts.sh
@@
-1,7
+1,7
@@
#!/usr/bin/env bash
#!/usr/bin/env bash
-# Copyright (c) 20
19
Cisco and/or its affiliates.
-# Copyright (c) 20
19
PANTHEON.tech and/or its affiliates.
+# Copyright (c) 20
21
Cisco and/or its affiliates.
+# Copyright (c) 20
21
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:
@@
-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.
@@
-79,9
+86,9
@@
function download_ubuntu_artifacts () {
repository installation was not successful."
fi
repository installation was not successful."
fi
- p
ackage
s=$(apt-cache -o Dir::Etc::SourceList=${apt_fdio_repo_file} \
+ p
kg
s=$(apt-cache -o Dir::Etc::SourceList=${apt_fdio_repo_file} \
-o Dir::Etc::SourceParts=${apt_fdio_repo_file} dumpavail \
-o Dir::Etc::SourceParts=${apt_fdio_repo_file} dumpavail \
- | grep Package: | cut -d " " -f 2) || {
+ | grep Package: | cut -d " " -f 2
| grep vpp
) || {
die "Retrieval of available VPP packages failed."
}
if [ -z "${VPP_VERSION-}" ]; then
die "Retrieval of available VPP packages failed."
}
if [ -z "${VPP_VERSION-}" ]; then
@@
-95,9
+102,9
@@
function download_ubuntu_artifacts () {
fi
set +x
fi
set +x
- for package in ${p
ackage
s}; do
+ for package in ${p
kg
s}; do
# Filter packages with given version
# 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-}[^ ]*" | \
@@
-112,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."
}
@@
-124,66
+131,70
@@
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.
artifacts=()
die "Packagecloud FD.io repo fetch failed."
}
# If version is set we will add suffix.
artifacts=()
- p
ackage
s=(vpp vpp-selinux-policy vpp-devel vpp-lib vpp-plugins vpp-api-python)
+ p
kg
s=(vpp vpp-selinux-policy vpp-devel vpp-lib vpp-plugins vpp-api-python)
if [ -z "${VPP_VERSION-}" ]; then
if [ -z "${VPP_VERSION-}" ]; then
- artif
acts+=(${package
s[@]})
+ artif
s+=(${pkg
s[@]})
else
else
- artif
acts+=(${package
s[@]/%/-${VPP_VERSION-}})
+ artif
s+=(${pkg
s[@]/%/-${VPP_VERSION-}})
fi
fi
- if [
"${INSTALL:-false}" = true
]; then
- sudo yum -y install "${artif
act
s[@]}" || {
+ if [
[ "${INSTALL:-false}" == "true" ]
]; then
+ sudo yum -y install "${artifs[@]}" || {
die "Install VPP artifact failed."
}
else
die "Install VPP artifact failed."
}
else
- sudo yum -y install --downloadonly --downloaddir=. "${artif
act
s[@]}" || {
+ sudo yum -y install --downloadonly --downloaddir=. "${artifs[@]}" || {
die "Download VPP artifacts failed."
}
fi
}
function download_opensuse_artifacts () {
die "Download VPP artifacts failed."
}
fi
}
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.
- artif
act
s=()
- p
ackage
s=(vpp vpp-devel vpp-lib vpp-plugins libvpp0)
+ artifs=()
+ p
kg
s=(vpp vpp-devel vpp-lib vpp-plugins libvpp0)
if [ -z "${VPP_VERSION-}" ]; then
if [ -z "${VPP_VERSION-}" ]; then
- artif
acts+=(${package
s[@]})
+ artif
s+=(${pkg
s[@]})
else
else
- artif
acts+=(${package
s[@]/%/-${VPP_VERSION-}})
+ artif
s+=(${pkg
s[@]/%/-${VPP_VERSION-}})
fi
fi
- if [
"${INSTALL:-false}" = true
]; then
- sudo yum -y install "${artif
act
s[@]}" || {
+ if [
[ "${INSTALL:-false}" == "true" ]
]; then
+ sudo yum -y install "${artifs[@]}" || {
die "Install VPP artifact failed."
}
else
die "Install VPP artifact failed."
}
else
- sudo yum -y install --downloadonly --downloaddir=. "${artif
act
s[@]}" || {
+ sudo yum -y install --downloadonly --downloaddir=. "${artifs[@]}" || {
die "Download VPP artifacts failed."
}
fi
die "Download VPP artifacts failed."
}
fi