Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add support for aarch64 container images
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
per_patch.sh
diff --git
a/resources/libraries/bash/function/per_patch.sh
b/resources/libraries/bash/function/per_patch.sh
index
27fa0cf
..
fc608c4
100644
(file)
--- a/
resources/libraries/bash/function/per_patch.sh
+++ b/
resources/libraries/bash/function/per_patch.sh
@@
-15,13
+15,10
@@
set -exuo pipefail
# This library defines functions used mainly by per patch entry scripts.
# Generally, the functions assume "common.sh" library has been sourced already.
# This library defines functions used mainly by per patch entry scripts.
# Generally, the functions assume "common.sh" library has been sourced already.
-
# Keep functions ordered alphabetically, please.
function archive_test_results () {
# Keep functions ordered alphabetically, please.
function archive_test_results () {
- set -exuo pipefail
-
# Arguments:
# - ${1}: Directory to archive to. Required. Parent has to exist.
# Variable set:
# Arguments:
# - ${1}: Directory to archive to. Required. Parent has to exist.
# Variable set:
@@
-34,6
+31,8
@@
function archive_test_results () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
+ set -exuo pipefail
+
cd "${VPP_DIR}" || die "Change directory command failed."
TARGET="$(readlink -f "$1")"
mkdir -p "${TARGET}" || die "Directory creation failed."
cd "${VPP_DIR}" || die "Change directory command failed."
TARGET="$(readlink -f "$1")"
mkdir -p "${TARGET}" || die "Directory creation failed."
@@
-47,8
+46,6
@@
function archive_test_results () {
function archive_parse_test_results () {
function archive_parse_test_results () {
- set -exuo pipefail
-
# Arguments:
# - ${1}: Directory to archive to. Required. Parent has to exist.
# Variables read:
# Arguments:
# - ${1}: Directory to archive to. Required. Parent has to exist.
# Variables read:
@@
-58,6
+55,8
@@
function archive_parse_test_results () {
# - archive_test_results - Archiving results.
# - parse_bmrr_results - See definition in this file.
# - archive_test_results - Archiving results.
# - parse_bmrr_results - See definition in this file.
+ set -exuo pipefail
+
archive_test_results "$1" || die
parse_bmrr_results "${TARGET}" || {
die "The function should have died on error."
archive_test_results "$1" || die
parse_bmrr_results "${TARGET}" || {
die "The function should have died on error."
@@
-67,9
+66,7
@@
function archive_parse_test_results () {
function build_vpp_ubuntu_amd64 () {
function build_vpp_ubuntu_amd64 () {
- set -exuo pipefail
-
- # This function is using Vagrant script to build VPP with all dependencies
+ # This function is using make pkg-verify to build VPP with all dependencies
# that is ARCH/OS aware. VPP repo is SSOT for building mechanics and CSIT
# is consuming artifacts. This way if VPP will introduce change in building
# mechanics they will not be blocked by CSIT repo.
# that is ARCH/OS aware. VPP repo is SSOT for building mechanics and CSIT
# is consuming artifacts. This way if VPP will introduce change in building
# mechanics they will not be blocked by CSIT repo.
@@
-82,21
+79,18
@@
function build_vpp_ubuntu_amd64 () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
+ set -exuo pipefail
+
cd "${VPP_DIR}" || die "Change directory command failed."
cd "${VPP_DIR}" || die "Change directory command failed."
- echo 'Building using "make build-root/vagrant/build.sh"'
- build-root/vagrant/"build.sh" || die "Vagrant VPP build script failed."
- echo "*******************************************************************"
+ make pkg-verify || die "VPP build using make pkg-verify failed."
echo "* VPP ${1-} BUILD SUCCESSFULLY COMPLETED" || {
die "Argument not found."
}
echo "* VPP ${1-} BUILD SUCCESSFULLY COMPLETED" || {
die "Argument not found."
}
- echo "*******************************************************************"
}
function compare_test_results () {
}
function compare_test_results () {
- set -exuo pipefail
-
# Variables read:
# - VPP_DIR - Path to directory with VPP git repo (at least built parts).
# - ARCHIVE_DIR - Path to where robot result files are created in.
# Variables read:
# - VPP_DIR - Path to directory with VPP git repo (at least built parts).
# - ARCHIVE_DIR - Path to where robot result files are created in.
@@
-111,6
+105,8
@@
function compare_test_results () {
# - 0 - If the comparison utility sees no regression (nor data error).
# - 1 - If the comparison utility sees a regression (or data error).
# - 0 - If the comparison utility sees no regression (nor data error).
# - 1 - If the comparison utility sees a regression (or data error).
+ set -exuo pipefail
+
cd "${VPP_DIR}" || die "Change directory operation failed."
# Reusing CSIT main virtualenv.
pip install -r "${PYTHON_SCRIPTS_DIR}/perpatch_requirements.txt" || {
cd "${VPP_DIR}" || die "Change directory operation failed."
# Reusing CSIT main virtualenv.
pip install -r "${PYTHON_SCRIPTS_DIR}/perpatch_requirements.txt" || {
@@
-123,8
+119,6
@@
function compare_test_results () {
function download_builds () {
function download_builds () {
- set -exuo pipefail
-
# This is mostly useful only for Sandbox testing, to avoid recompilation.
#
# Arguments:
# This is mostly useful only for Sandbox testing, to avoid recompilation.
#
# Arguments:
@@
-138,6
+132,8
@@
function download_builds () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
+ set -exuo pipefail
+
cd "${VPP_DIR}" || die "Change directory operation failed."
dirs=("build-root" "build_parent" "build_current" "archive" "csit_current")
rm -rf ${dirs[@]} || {
cd "${VPP_DIR}" || die "Change directory operation failed."
dirs=("build-root" "build_parent" "build_current" "archive" "csit_current")
rm -rf ${dirs[@]} || {
@@
-152,8
+148,6
@@
function download_builds () {
function initialize_csit_dirs () {
function initialize_csit_dirs () {
- set -exuo pipefail
-
# This could be in prepare_test, but download_builds also needs this.
#
# Variables read:
# This could be in prepare_test, but download_builds also needs this.
#
# Variables read:
@@
-164,6
+158,8
@@
function initialize_csit_dirs () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
+ set -exuo pipefail
+
cd "${VPP_DIR}" || die "Change directory operation failed."
rm -rf "csit_current" "csit_parent" || {
die "Directory deletion failed."
cd "${VPP_DIR}" || die "Change directory operation failed."
rm -rf "csit_current" "csit_parent" || {
die "Directory deletion failed."
@@
-176,8
+172,6
@@
function initialize_csit_dirs () {
function parse_bmrr_results () {
function parse_bmrr_results () {
- set -exuo pipefail
-
# Currently "parsing" is just two greps.
# TODO: Re-use PAL parsing code, make parsing more general and centralized.
#
# Currently "parsing" is just two greps.
# TODO: Re-use PAL parsing code, make parsing more general and centralized.
#
@@
-190,6
+184,8
@@
function parse_bmrr_results () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
+ set -exuo pipefail
+
rel_dir="$(readlink -e "${1}")" || die "Readlink failed."
in_file="${rel_dir}/output.xml"
out_file="${rel_dir}/results.txt"
rel_dir="$(readlink -e "${1}")" || die "Readlink failed."
in_file="${rel_dir}/output.xml"
out_file="${rel_dir}/results.txt"
@@
-206,8
+202,6
@@
function parse_bmrr_results () {
function select_build () {
function select_build () {
- set -exuo pipefail
-
# Arguments:
# - ${1} - Path to directory to copy VPP artifacts from. Required.
# Variables read:
# Arguments:
# - ${1} - Path to directory to copy VPP artifacts from. Required.
# Variables read:
@@
-220,6
+214,8
@@
function select_build () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
+ set -exuo pipefail
+
cd "${VPP_DIR}" || die "Change directory operation failed."
source_dir="$(readlink -e "$1")"
rm -rf "${DOWNLOAD_DIR}"/* || die "Cleanup of download dir failed."
cd "${VPP_DIR}" || die "Change directory operation failed."
source_dir="$(readlink -e "$1")"
rm -rf "${DOWNLOAD_DIR}"/* || die "Cleanup of download dir failed."
@@
-231,8
+227,6
@@
function select_build () {
function set_aside_commit_build_artifacts () {
function set_aside_commit_build_artifacts () {
- set -exuo pipefail
-
# Function is copying VPP built artifacts from actual checkout commit for
# further use and clean git.
# Variables read:
# Function is copying VPP built artifacts from actual checkout commit for
# further use and clean git.
# Variables read:
@@
-245,6
+239,8
@@
function set_aside_commit_build_artifacts () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
+ set -exuo pipefail
+
cd "${VPP_DIR}" || die "Change directory operation failed."
rm -rf "build_current" || die "Remove operation failed."
mkdir -p "build_current" || die "Directory creation failed."
cd "${VPP_DIR}" || die "Change directory operation failed."
rm -rf "build_current" || die "Remove operation failed."
mkdir -p "build_current" || die "Directory creation failed."
@@
-262,8
+258,6
@@
function set_aside_commit_build_artifacts () {
function set_aside_parent_build_artifacts () {
function set_aside_parent_build_artifacts () {
- set -exuo pipefail
-
# Function is copying VPP built artifacts from parent checkout commit for
# further use. Checkout to parent is not part of this function.
# Variables read:
# Function is copying VPP built artifacts from parent checkout commit for
# further use. Checkout to parent is not part of this function.
# Variables read:
@@
-275,6
+269,8
@@
function set_aside_parent_build_artifacts () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
+ set -exuo pipefail
+
cd "${VPP_DIR}" || die "Change directory operation failed."
rm -rf "build_parent" || die "Remove failed."
mkdir -p "build_parent" || die "Directory creation operation failed."
cd "${VPP_DIR}" || die "Change directory operation failed."
rm -rf "build_parent" || die "Remove failed."
mkdir -p "build_parent" || die "Directory creation operation failed."
@@
-284,21
+280,19
@@
function set_aside_parent_build_artifacts () {
function set_perpatch_dut () {
function set_perpatch_dut () {
- set -exuo pipefail
-
# Variables set:
# - DUT - CSIT test/ subdirectory containing suites to execute.
# TODO: Detect DUT from job name, when we have more than just VPP perpatch.
# Variables set:
# - DUT - CSIT test/ subdirectory containing suites to execute.
# TODO: Detect DUT from job name, when we have more than just VPP perpatch.
+ set -exuo pipefail
+
DUT="vpp"
}
function set_perpatch_vpp_dir () {
DUT="vpp"
}
function set_perpatch_vpp_dir () {
- set -exuo pipefail
-
# Variables read:
# - CSIT_DIR - Path to existing root of local CSIT git repository.
# Variables set:
# Variables read:
# - CSIT_DIR - Path to existing root of local CSIT git repository.
# Variables set:
@@
-306,6
+300,8
@@
function set_perpatch_vpp_dir () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
+ set -exuo pipefail
+
# In perpatch, CSIT is cloned inside VPP clone.
VPP_DIR="$(readlink -e "${CSIT_DIR}/..")" || die "Readlink failed."
}
# In perpatch, CSIT is cloned inside VPP clone.
VPP_DIR="$(readlink -e "${CSIT_DIR}/..")" || die "Readlink failed."
}