diff --git a/dev/containers/f29-rpms-py3 b/dev/containers/f29-rpms-py3 index bb000a7..6eea880 100644 --- a/dev/containers/f29-rpms-py3 +++ b/dev/containers/f29-rpms-py3 @@ -12,6 +12,7 @@ RUN dnf -y install \ which \ git +# FIXME: this should use $REPO and $BRANCH: RUN cd / \ && git clone https://pagure.io/pagure.git \ && chmod +x /pagure/dev/containers/runtests_py3.sh @@ -25,7 +26,6 @@ RUN dnf install -y `grep "Requires:" /pagure/files/pagure.spec | \ dnf clean all && \ cd /pagure && python setup.py build - WORKDIR /pagure ENTRYPOINT ["/pagure/dev/containers/runtests_py3.sh"] CMD [] diff --git a/dev/containers/runtests_py2.sh b/dev/containers/runtests_py2.sh index 9bc6301..ed39786 100644 --- a/dev/containers/runtests_py2.sh +++ b/dev/containers/runtests_py2.sh @@ -22,4 +22,4 @@ echo "Last commits:" git --no-pager log -2 fi -python2 /pagure/runtests.py run -f --py2 +python2 /pagure/runtests.py run -f --py2 $TESTCASE diff --git a/dev/containers/runtests_py3.sh b/dev/containers/runtests_py3.sh index cefded8..ac2bf03 100644 --- a/dev/containers/runtests_py3.sh +++ b/dev/containers/runtests_py3.sh @@ -22,4 +22,4 @@ echo "Last commits:" git --no-pager log -2 fi -python3 /pagure/runtests.py run -f --py3 +python3 /pagure/runtests.py run -f --py3 $TESTCASE diff --git a/dev/run-tests-container.py b/dev/run-tests-container.py old mode 100644 new mode 100755 index 55f5648..489f2da --- a/dev/run-tests-container.py +++ b/dev/run-tests-container.py @@ -126,10 +126,10 @@ if __name__ == "__main__": "BRANCH={}".format(os.environ.get("BRANCH") or ""), "-e", "REPO={}".format(os.environ.get("REPO") or ""), + "-e", + "TESTCASE={}".format(args.test_case or ""), container_name, - args.test_case, ] - output_code = sp.call(command) if output_code: failed.append(container_name)