From 1ee861ae54598296e8001d625776864a57c3085c Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Dec 19 2018 12:43:43 +0000 Subject: Make the container tests use python3 Signed-off-by: Clement Verna --- diff --git a/dev/docker/test_env_template b/dev/docker/test_env_template index 81a528b..dc5869b 100644 --- a/dev/docker/test_env_template +++ b/dev/docker/test_env_template @@ -4,7 +4,11 @@ $epel_pkg $infra_repo RUN $pkg_mgr install -y $pkg_list \ - && $pkg_mgr clean all + && $pkg_mgr clean all \ +# for the hooks we need to have /usr/bin/python + && cp /usr/bin/python3 /usr/bin/python \ +# for the alembic test we need /usr/bin/alembic + && cp /usr/bin/alembic-3 /usr/bin/alembic WORKDIR /pagure ENTRYPOINT [ "/pagure/runtests.py", "run" ] diff --git a/dev/run-tests-container.py b/dev/run-tests-container.py index d3e0d17..1f44b4c 100755 --- a/dev/run-tests-container.py +++ b/dev/run-tests-container.py @@ -6,16 +6,16 @@ from string import Template TEMPLATE = "dev/docker/test_env_template" -PKG_LIST = "python-alembic python-arrow python-binaryornot \ - python-bleach python-blinker python-chardet python-cryptography \ - python-docutils python-enum34 python-flask python2-fedora-flask \ - python-flask-wtf python2-bcrypt python-jinja2 \ - python-markdown python-munch python-openid-cla \ - python-openid-teams python-psutil python-pygit2 python2-pillow \ - python-sqlalchemy python-straight-plugin python-wtforms \ - python-nose python3-coverage python-mock python-mock \ - python-eventlet python2-flask-oidc python-flake8 python-celery \ - python-redis python-trololio python-beautifulsoup4 redis vim git" +PKG_LIST = "python3-alembic python3-arrow python3-binaryornot \ + python3-bleach python3-blinker python3-chardet python3-cryptography \ + python3-docutils python3-flask python3-fedora-flask \ + python3-flask-wtf python3-bcrypt python3-jinja2 \ + python3-markdown python3-munch python3-openid-cla \ + python3-openid-teams python3-psutil python3-pygit2 python3-pillow \ + python3-sqlalchemy python3-straight-plugin python3-wtforms \ + python3-nose python3-coverage python3-mock python3-mock \ + python3-eventlet python3-flask-oidc python3-flake8 python3-celery \ + python3-redis python3-trololio python3-beautifulsoup4 python3-black redis vim git" def setup_parser():