diff --git a/test/.env b/test/.env index 30222c33..23b28816 100644 --- a/test/.env +++ b/test/.env @@ -2,11 +2,11 @@ # shellcheck disable=SC2034,SC2154 # Current container image -INFIX_TEST=ghcr.io/kernelkit/infix-test:1.7 +INFIX_TEST=ghcr.io/kernelkit/infix-test:1.8 ixdir=$(readlink -f "$testdir/..") logdir=$(readlink -f "$testdir/.log") -envdir="$HOME/.infix-test-venv" +envdir="$HOME/.infix/venv" qeneth="$testdir/qeneth/qeneth" runners="podman docker" diff --git a/test/docker/README.md b/test/docker/README.md index aa9f977a..83b09004 100644 --- a/test/docker/README.md +++ b/test/docker/README.md @@ -19,7 +19,7 @@ the image, e.g., with missing Alpine packages. docker build -t ghcr.io/kernelkit/infix-test:0.4 . 3. Update the `test/.env` file to use the new version - 4. Verify your new image works properly (remember to remove your `~/.infix-test-venv`) + 4. Verify your new image works properly (remember to remove your `~/.infix/venv`) 5. Send PR to co-maintainer for review The co-maintainer should then verify themselves before approving the PR. diff --git a/test/docker/init-venv.sh b/test/docker/init-venv.sh index 8dd23a82..84f7f692 100755 --- a/test/docker/init-venv.sh +++ b/test/docker/init-venv.sh @@ -1,10 +1,12 @@ #!/bin/sh +# shellcheck disable=SC1090 set -e -python3 -m venv ~/.infix-test-venv -cp -r ~/yang ~/.infix-test-venv/yangdir -. ~/.infix-test-venv/bin/activate +mkdir -p ~/.infix/venv +python3 -m venv ~/.infix/venv +cp -r ~/yang ~/.infix/venv/yangdir +. ~/.infix/venv/bin/activate python3 -m pip install --upgrade pip python3 -m pip install -r "$1"