From 8dc78e32e85e8771157ac9ea4193a34f7ae90a7e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 14 2017 13:40:07 +0000 Subject: [PATCH 1/2] Install all the dependencies when running the tests for CI Signed-off-by: Pierre-Yves Chibon --- diff --git a/run_ci_tests.sh b/run_ci_tests.sh index c2ff8d6..2cea607 100755 --- a/run_ci_tests.sh +++ b/run_ci_tests.sh @@ -35,6 +35,8 @@ then pip install -r requirements.txt pip install psycopg2 pip install python-openid python-openid-teams python-openid-cla + # Install optional dependencies, we need them all for the tests + pip install py-bcrypt python-fedora flask-oidc cryptography pip uninstall cffi -y else From 340d79e7c173060a981e90e5cf060ff05ed289dd Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 14 2017 17:42:57 +0000 Subject: [PATCH 2/2] Disable faitout in jenkins for now Signed-off-by: Pierre-Yves Chibon --- diff --git a/run_ci_tests.sh b/run_ci_tests.sh index 2cea607..e8ec9e5 100755 --- a/run_ci_tests.sh +++ b/run_ci_tests.sh @@ -48,6 +48,8 @@ trap deactivate SIGINT SIGTERM EXIT # Reload where the nosetests app is (within the venv) hash -r +# Do not run the tests against faitout anymore, faitout is unhappy +sed -i -e 's|BUILD_ID|BUID_ID|' tests/__init__.py python setup.py build