diff --git a/tests/anolis-sys-tests/install.sh b/tests/anolis-sys-tests/install.sh index 1733193de04a07b68b65e1a68fca19ff69a902ec..48b052a9cf27d630cd9e9020c983f933af38bccf 100755 --- a/tests/anolis-sys-tests/install.sh +++ b/tests/anolis-sys-tests/install.sh @@ -11,10 +11,6 @@ build() { } install() { - python3 -m pip install -r $TONE_BM_BUILD_DIR/requirements.txt || { - pip3 config set global.index-url http://mirrors.aliyun.com/pypi/simple/ - python3 -m pip install -r $TONE_BM_BUILD_DIR/requirements.txt --ignore-installed --trusted-host mirrors.aliyun.com - } cp -a $TONE_BM_BUILD_DIR/* $TONE_BM_RUN_DIR } diff --git a/tests/anolis-sys-tests/run.sh b/tests/anolis-sys-tests/run.sh index d83bda29aadb2279771c08a05219fb7026261e7a..cb54e569e2b6067e0924b7127d1a7e58cb7fe1f6 100755 --- a/tests/anolis-sys-tests/run.sh +++ b/tests/anolis-sys-tests/run.sh @@ -9,6 +9,15 @@ . $TONE_ROOT/lib/testinfo.sh setup() { + if python3 -m pip list | grep avocado-framework; then + python3 -m pip uninstall avocado-framework avocado-framework-plugin-varianter-yaml-to-mux -y + fi + python3 -m pip install --upgrade pip + pip3 install --ignore-installed PyYAML + python3 -m pip install -r $TONE_BM_RUN_DIR/requirements.txt || { + pip3 config set global.index-url http://mirrors.aliyun.com/pypi/simple/ + python3 -m pip install -r $TONE_BM_RUN_DIR/requirements.txt --ignore-installed --trusted-host mirrors.aliyun.com + } export PYTHONPATH=$PYTHONPATH:$TONE_BM_RUN_DIR/tests IFS="," } diff --git a/tests/image-ci-test/install.sh b/tests/image-ci-test/install.sh index 81686a944398493b97e7a4d0f58bb68b54bc3462..b32335a0f8aebab26aab945aa9eba5a684763c2f 100644 --- a/tests/image-ci-test/install.sh +++ b/tests/image-ci-test/install.sh @@ -9,11 +9,9 @@ DEP_PKG_LIST="python3" fetch() { - git_clone $GIT_URL $TONE_BM_CACHE_DIR + : } - - build() { : @@ -21,7 +19,7 @@ build() install() { - cp -Trf $TONE_BM_CACHE_DIR $TONE_BM_RUN_DIR + cp -Trf $TONE_BM_BUILD_DIR $TONE_BM_RUN_DIR }