From 04edc20d067359e91c80250e51cefdcef6eaa8f3 Mon Sep 17 00:00:00 2001 From: Albrecht Lohofener Date: Mon, 2 Dec 2024 12:02:55 +0100 Subject: [PATCH] Fix automated tests. Now a python venv is required. --- .github/workflows/openwrt-2410-snapshot-build.yml | 8 ++++---- .github/workflows/openwrt-master-build.yml | 8 ++++---- .github/workflows/openwrt-stable-build.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/openwrt-2410-snapshot-build.yml b/.github/workflows/openwrt-2410-snapshot-build.yml index 3fc000c..f874e7a 100644 --- a/.github/workflows/openwrt-2410-snapshot-build.yml +++ b/.github/workflows/openwrt-2410-snapshot-build.yml @@ -263,12 +263,12 @@ jobs: multipass exec router-vm -- docker stop portainer # Install python - multipass exec router-vm -- sudo apt-get -y install python3-pip python-is-python3 + multipass exec router-vm -- sudo apt-get -y install python3-pip python-is-python3 python3-venv # Install everthing for pytest multipass exec router-vm -- find . - #multipass exec router-vm -- export PATH=$PATH:~/.local/bin # not working - multipass exec router-vm -- pip install -r test/requirements.txt + multipass exec router-vm -- bash -c 'python -m venv ~/.venv' + multipass exec router-vm -- bash -c 'source ~/.venv/bin/activate && pip install -r test/requirements.txt' echo '******** router-vm IPs ********' multipass exec router-vm -- ip addr @@ -311,7 +311,7 @@ jobs: run: | cat test/tests/docker-compose.yml.template # Run pytest - multipass exec router-vm -- sh -c 'cd test/ && ~/.local/bin/pytest -v -s --html=report.html --self-contained-html' + multipass exec router-vm -- bash -c 'source ~/.venv/bin/activate && cd test/ && pytest -v -s --html=report.html --self-contained-html' - name: Archive test report if: always() diff --git a/.github/workflows/openwrt-master-build.yml b/.github/workflows/openwrt-master-build.yml index 4bee985..16c1d2e 100644 --- a/.github/workflows/openwrt-master-build.yml +++ b/.github/workflows/openwrt-master-build.yml @@ -265,12 +265,12 @@ jobs: multipass exec router-vm -- docker stop portainer # Install python - multipass exec router-vm -- sudo apt-get -y install python3-pip python-is-python3 + multipass exec router-vm -- sudo apt-get -y install python3-pip python-is-python3 python3-venv # Install everthing for pytest multipass exec router-vm -- find . - #multipass exec router-vm -- export PATH=$PATH:~/.local/bin # not working - multipass exec router-vm -- pip install -r test/requirements.txt + multipass exec router-vm -- bash -c 'python -m venv ~/.venv' + multipass exec router-vm -- bash -c 'source ~/.venv/bin/activate && pip install -r test/requirements.txt' echo '******** router-vm IPs ********' multipass exec router-vm -- ip addr @@ -318,7 +318,7 @@ jobs: run: | cat test/tests/docker-compose.yml.template # Run pytest - multipass exec router-vm -- sh -c 'cd test/ && ~/.local/bin/pytest -v -s --html=report.html --self-contained-html' + multipass exec router-vm -- bash -c 'source ~/.venv/bin/activate && cd test/ && pytest -v -s --html=report.html --self-contained-html' - name: Archive test report if: always() diff --git a/.github/workflows/openwrt-stable-build.yml b/.github/workflows/openwrt-stable-build.yml index fb1cf95..9094e46 100644 --- a/.github/workflows/openwrt-stable-build.yml +++ b/.github/workflows/openwrt-stable-build.yml @@ -257,12 +257,12 @@ jobs: multipass exec router-vm -- docker stop portainer # Install python - multipass exec router-vm -- sudo apt-get -y install python3-pip python-is-python3 + multipass exec router-vm -- sudo apt-get -y install python3-pip python-is-python3 python3-venv # Install everthing for pytest multipass exec router-vm -- find . - #multipass exec router-vm -- export PATH=$PATH:~/.local/bin # not working - multipass exec router-vm -- pip install -r test/requirements.txt + multipass exec router-vm -- bash -c 'python -m venv ~/.venv' + multipass exec router-vm -- bash -c 'source ~/.venv/bin/activate && pip install -r test/requirements.txt' echo '******** router-vm IPs ********' multipass exec router-vm -- ip addr @@ -303,7 +303,7 @@ jobs: - name: Run tests run: | # Run pytest - multipass exec router-vm -- sh -c 'cd test/ && ~/.local/bin/pytest -v -s --html=report.html --self-contained-html' + multipass exec router-vm -- bash -c 'source ~/.venv/bin/activate && cd test/ && pytest -v -s --html=report.html --self-contained-html' - name: Archive test report if: always()