Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vppdevice: fix install-dep failure when component install is required
[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
696fc71
..
f7a7a00
100644
(file)
--- a/
resources/libraries/bash/function/common.sh
+++ b/
resources/libraries/bash/function/common.sh
@@
-648,16
+648,13
@@
function run_pybot () {
}
}
-function select_os () {
+function select_
arch_
os () {
- # Populate variables related to local operating system.
- #
- # Also install any missing prerequisities CSIT tests need.
- # TODO: Move the installation to a separate function?
+ # Set variables affected by local CPU architecture and operating system.
#
# Variables set:
#
# Variables set:
- # - VPP_VER_FILE - Name of
F
ile in CSIT dir containing vpp stable version.
- # - IMAGE_VER_FILE - Name of
F
ile in CSIT dir containing the image name.
+ # - VPP_VER_FILE - Name of
f
ile in CSIT dir containing vpp stable version.
+ # - IMAGE_VER_FILE - Name of
f
ile in CSIT dir containing the image name.
# - PKG_SUFFIX - Suffix of OS package file name, "rpm" or "deb."
set -exuo pipefail
# - PKG_SUFFIX - Suffix of OS package file name, "rpm" or "deb."
set -exuo pipefail
@@
-678,7
+675,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
}
@@
-788,11
+797,9
@@
function select_tags () {
test_tag_array+=("!drv_avf")
;;
*"3n-tsh"*)
test_tag_array+=("!drv_avf")
;;
*"3n-tsh"*)
+ # 3n-tsh only has x520 NICs which don't work with AVF
+ test_tag_array+=("!drv_avf")
test_tag_array+=("!ipsechw")
test_tag_array+=("!ipsechw")
- test_tag_array+=("!memif")
- test_tag_array+=("!srv6_proxy")
- test_tag_array+=("!vhost")
- test_tag_array+=("!vts")
;;
*"3n-hsw"*)
# TODO: Introduce NOIOMMU version of AVF tests.
;;
*"3n-hsw"*)
# TODO: Introduce NOIOMMU version of AVF tests.
@@
-893,7
+900,7
@@
function select_topology () {
;;
"3n_tsh")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml )
;;
"3n_tsh")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml )
- TOPOLOGIES_TAGS="3_node_
*
_link_topo"
+ TOPOLOGIES_TAGS="3_node_
single
_link_topo"
;;
*)
# No falling back to 3n_hsw default, that should have been done
;;
*)
# No falling back to 3n_hsw default, that should have been done