summaryrefslogtreecommitdiff
path: root/podman
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2022-06-21 12:07:13 +0200
committerjaseg <git@jaseg.de>2022-06-21 12:07:13 +0200
commitee233317f1c5541a302c4f062b9957ae7ea335c2 (patch)
tree9c8f5ea85ba86479c9b5dbf00c3849a0a039e527 /podman
parent6752dab1254e2995e4d8545e2ae95be7be085a40 (diff)
downloadgerbonara-ee233317f1c5541a302c4f062b9957ae7ea335c2.tar.gz
gerbonara-ee233317f1c5541a302c4f062b9957ae7ea335c2.tar.bz2
gerbonara-ee233317f1c5541a302c4f062b9957ae7ea335c2.zip
Fix local testsv0.10.9
Diffstat (limited to 'podman')
-rw-r--r--podman/arch-testenv2
-rw-r--r--podman/testdata/.gitignore1
-rwxr-xr-xpodman/testdata/testscript.sh9
-rw-r--r--podman/ubuntu-testenv3
4 files changed, 6 insertions, 9 deletions
diff --git a/podman/arch-testenv b/podman/arch-testenv
index e878362..2ab09a6 100644
--- a/podman/arch-testenv
+++ b/podman/arch-testenv
@@ -2,7 +2,7 @@
FROM docker.io/archlinux:latest
MAINTAINER gerbolyze@jaseg.de
RUN pacman --noconfirm -Syu
-RUN pacman --noconfirm -Sy git python python-pip base-devel python-numpy python-slugify python-lxml python-click python-pillow librsvg python-scipy python-sphinx python-pytest twine python-beautifulsoup4 gerbv rustup cargo
+RUN pacman --noconfirm -Sy git python python-pip base-devel python-numpy python-slugify python-lxml python-click python-pillow librsvg python-scipy python-sphinx python-pytest twine python-beautifulsoup4 gerbv rustup cargo rsync
RUN python3 -m pip install pytest-parallel
RUN rustup install stable
RUN rustup default stable
diff --git a/podman/testdata/.gitignore b/podman/testdata/.gitignore
new file mode 100644
index 0000000..5664e30
--- /dev/null
+++ b/podman/testdata/.gitignore
@@ -0,0 +1 @@
+git
diff --git a/podman/testdata/testscript.sh b/podman/testdata/testscript.sh
index 4e191b9..d36560d 100755
--- a/podman/testdata/testscript.sh
+++ b/podman/testdata/testscript.sh
@@ -1,12 +1,7 @@
#!/bin/sh
set -e
-git clone /data/git git
+rsync -av /data/git git
cd git
-if [ $# -ge 1 -a "$1" = "--parallel" ]; then
- python3 -m pytest --workers auto
-else
- python3 -m pytest -x
-fi
-
+python3 -m pytest $@
diff --git a/podman/ubuntu-testenv b/podman/ubuntu-testenv
index df8834a..1e02963 100644
--- a/podman/ubuntu-testenv
+++ b/podman/ubuntu-testenv
@@ -2,6 +2,7 @@
FROM docker.io/ubuntu:latest
MAINTAINER gerbolyze@jaseg.de
RUN env DEBIAN_FRONTEND=noninteractive apt update -y
-RUN env DEBIAN_FRONTEND=noninteractive apt install -y python3 git python3-wheel curl python3-pip python3-venv cargo
+RUN env DEBIAN_FRONTEND=noninteractive apt install -y python3 git python3-wheel curl python3-pip python3-venv cargo gerbv
RUN cargo install usvg resvg
RUN python3 -m pip install numpy slugify lxml click pillow scipy sphinx pytest beautifulsoup4 pytest-parallel
+RUN env DEBIAN_FRONTEND=noninteractive apt install -y rsync