From 7b5c35008903b5afa0faff74cc77724f5499f8fc Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Fri, 8 Sep 2023 15:46:49 +0200 Subject: [PATCH] fix Tumbleweed docker --- docker/opensuse-tumbleweed/Dockerfile | 3 +-- docker/opensuse-tumbleweed/README.md | 5 +++++ docker/opensuse-tumbleweed/run_tests.sh | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docker/opensuse-tumbleweed/Dockerfile b/docker/opensuse-tumbleweed/Dockerfile index 04aaff64c..8a18c7d43 100644 --- a/docker/opensuse-tumbleweed/Dockerfile +++ b/docker/opensuse-tumbleweed/Dockerfile @@ -8,8 +8,7 @@ RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-de # zypper --gpg-auto-import-keys refresh && \ # zypper --non-interactive install cross-arm-none-eabi-gcc12 cross-arm-none-eabi-newlib -RUN zypper --non-interactive install cmake python3 python3-pip && \ - python3 -m pip install ansicolors sslcrypto +RUN zypper --non-interactive install cmake python311 python311-pip python311-virtualenv RUN zypper --non-interactive install ocl-icd-devel diff --git a/docker/opensuse-tumbleweed/README.md b/docker/opensuse-tumbleweed/README.md index bd55e0c9d..282d3f4f7 100644 --- a/docker/opensuse-tumbleweed/README.md +++ b/docker/opensuse-tumbleweed/README.md @@ -16,5 +16,10 @@ Or if you want to run single test, ``` sudo zypper refresh && sudo zypper --non-interactive update make clean; make -j +python3 -m venv /tmp/venv +source /tmp/venv/bin/activate +python3 -m pip install --use-pep517 pyaes +python3 -m pip install ansicolors sslcrypto tools/pm3_tests.sh --long +deactivate ``` diff --git a/docker/opensuse-tumbleweed/run_tests.sh b/docker/opensuse-tumbleweed/run_tests.sh index 9002131e9..bb613ffc0 100755 --- a/docker/opensuse-tumbleweed/run_tests.sh +++ b/docker/opensuse-tumbleweed/run_tests.sh @@ -5,4 +5,9 @@ # docker/opensuse-tumbleweed/run_tests.sh; sudo zypper refresh && sudo zypper --non-interactive update +python3 -m venv /tmp/venv +source /tmp/venv/bin/activate +python3 -m pip install --use-pep517 pyaes +python3 -m pip install ansicolors sslcrypto tools/release_tests.sh +deactivate