Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Install also sshpass tin centos bootstraps
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
common.sh
diff --git
a/resources/libraries/bash/function/common.sh
b/resources/libraries/bash/function/common.sh
index
a7f79e0
..
e576f99
100644
(file)
--- a/
resources/libraries/bash/function/common.sh
+++ b/
resources/libraries/bash/function/common.sh
@@
-648,7
+648,7
@@
function run_pybot () {
}
}
-function select_os () {
+function select_
arch_
os () {
# Populate variables related to local operating system.
#
# Populate variables related to local operating system.
#
@@
-678,7
+678,19
@@
function select_os () {
PKG_SUFFIX="rpm"
;;
*)
PKG_SUFFIX="rpm"
;;
*)
- die "Unable to identify distro or os from ${OS}"
+ die "Unable to identify distro or os from ${os_id}"
+ ;;
+ esac
+
+ arch=$(uname -m) || {
+ die "Get CPU architecture failed."
+ }
+
+ case "${arch}" in
+ "aarch64")
+ IMAGE_VER_FILE="${IMAGE_VER_FILE}_ARM"
+ ;;
+ *)
;;
esac
}
;;
esac
}
@@
-727,6
+739,7
@@
function select_tags () {
;;
esac
;;
esac
+ sed_nic_sub_cmd="sed s/\${default_nic}/${default_nic}/"
# Tag file directory shorthand.
tfd="${BASH_FUNCTION_DIR}"
case "${TEST_CODE}" in
# Tag file directory shorthand.
tfd="${BASH_FUNCTION_DIR}"
case "${TEST_CODE}" in
@@
-735,8
+748,8
@@
function select_tags () {
readarray -t test_tag_array < "${tfd}/mlr-weekly.txt" || die
;;
*"mrr-daily"* )
readarray -t test_tag_array < "${tfd}/mlr-weekly.txt" || die
;;
*"mrr-daily"* )
- readarray -t test_tag_array < \
-
"${tfd}/mrr-daily-${FLAVOR}.txt"
|| die
+ readarray -t test_tag_array <
<< $(${sed_nic_sub_cmd}
\
+
${tfd}/mrr-daily-${FLAVOR}.txt)
|| die
;;
*"mrr-weekly"* )
readarray -t test_tag_array < "${tfd}/mrr-weekly.txt" || die
;;
*"mrr-weekly"* )
readarray -t test_tag_array < "${tfd}/mrr-weekly.txt" || die