diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-12-05 16:06:40 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-12-05 16:06:40 +0000 |
| commit | a78df8f22fa6293718cc1053aea12662a911e785 (patch) | |
| tree | 7e0c566f2014f6c828d6773218e22bfeba83c65a /resources | |
| parent | 1d9a0ce311d15403432574ab0473274ae0a739fe (diff) | |
FIX: Some leftovers + csit_sut image sync
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I9b47f9a31c11f155ba5b4676ccf0fc4c413a3942
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 7 | ||||
| -rw-r--r-- | resources/tools/disk-image-builder/csit-sut/Dockerfile | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 3a7a0fbf7d..86659138bc 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -117,7 +117,7 @@ function activate_virtualenv () { die "Virtualenv package install failed." } virtualenv -p $(which python3) "${env_dir}" || { - die "Virtualenv creation for $(which python) failed." + die "Virtualenv creation for $(which python3) failed." } set +u source "${env_dir}/bin/activate" || die "Virtualenv activation failed." @@ -565,7 +565,7 @@ function reserve_and_cleanup_testbed () { set +e scrpt="${PYTHON_SCRIPTS_DIR}/topo_reservation.py" opts=("-t" "${topo}" "-r" "${BUILD_TAG:-Unknown}") - python "${scrpt}" "${opts[@]}" + python3 "${scrpt}" "${opts[@]}" result="$?" set -e if [[ "${result}" == "0" ]]; then @@ -637,7 +637,6 @@ function run_pybot () { pushd "${CSIT_DIR}" || die "Change directory operation failed." set +e - python -V robot "${all_options[@]}" "${GENERATED_DIR}/tests/" PYBOT_EXIT_STATUS="$?" set -e @@ -1029,7 +1028,7 @@ function untrap_and_unreserve_testbed () { warn "Testbed looks unreserved already. Trap removal failed before?" else ansible_hosts "cleanup" || true - python "${PYTHON_SCRIPTS_DIR}/topo_reservation.py" -c -t "${wt}" || { + python3 "${PYTHON_SCRIPTS_DIR}/topo_reservation.py" -c -t "${wt}" || { die "${1:-FAILED TO UNRESERVE, FIX MANUALLY.}" 2 } WORKING_TOPOLOGY="" diff --git a/resources/tools/disk-image-builder/csit-sut/Dockerfile b/resources/tools/disk-image-builder/csit-sut/Dockerfile index 9457201290..ba212dc960 100644 --- a/resources/tools/disk-image-builder/csit-sut/Dockerfile +++ b/resources/tools/disk-image-builder/csit-sut/Dockerfile @@ -48,8 +48,10 @@ RUN apt-get -q update \ dkms \ gfortran \ libblas-dev \ + libffi-dev \ liblapack-dev \ libpcap-dev \ + libssl-dev \ python-all \ python-apt \ python-cffi \ |