diff options
Diffstat (limited to 'resources/libraries/bash')
5 files changed, 18 insertions, 6 deletions
diff --git a/resources/libraries/bash/entry/bootstrap_verify_perf.sh b/resources/libraries/bash/entry/bootstrap_verify_perf.sh index b9299b1422..bf7fa3519c 100644 --- a/resources/libraries/bash/entry/bootstrap_verify_perf.sh +++ b/resources/libraries/bash/entry/bootstrap_verify_perf.sh @@ -36,7 +36,7 @@ common_dirs || die get_test_code "${1-}" || die get_test_tag_string || die select_topology || die -select_os || die +select_arch_os || die gather_build || die check_download_dir || die activate_virtualenv || die diff --git a/resources/libraries/bash/entry/bootstrap_vpp_device.sh b/resources/libraries/bash/entry/bootstrap_vpp_device.sh index 209943fb89..4ac73e777f 100755 --- a/resources/libraries/bash/entry/bootstrap_vpp_device.sh +++ b/resources/libraries/bash/entry/bootstrap_vpp_device.sh @@ -35,7 +35,7 @@ common_dirs || die get_test_code "${1-}" || die get_test_tag_string || die select_topology || die -select_os || die +select_arch_os || die gather_build || die check_download_dir || die activate_virtualenv || die diff --git a/resources/libraries/bash/entry/per_patch_device.sh b/resources/libraries/bash/entry/per_patch_device.sh index ac2c4a4ac5..6624047862 100644 --- a/resources/libraries/bash/entry/per_patch_device.sh +++ b/resources/libraries/bash/entry/per_patch_device.sh @@ -45,7 +45,7 @@ get_test_code "${1-}" || die get_test_tag_string || die set_perpatch_dut || die select_topology || die -select_os || die +select_arch_os || die select_build "build_current" || die check_download_dir || die activate_virtualenv "${VPP_DIR}" || die diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh index 195d1a70e0..ef75ea90ce 100644 --- a/resources/libraries/bash/entry/per_patch_perf.sh +++ b/resources/libraries/bash/entry/per_patch_perf.sh @@ -52,7 +52,7 @@ get_test_code "${1-}" || die get_test_tag_string || die set_perpatch_dut || die select_topology || die -select_os || die +select_arch_os || die activate_virtualenv "${VPP_DIR}" || die generate_tests || die archive_tests || die diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 696fc71189..e576f99d8d 100644 --- 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. # @@ -678,7 +678,19 @@ function select_os () { 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 } |