This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8427
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/dw/8427 by this push:
new 2188a5441 fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
2188a5441 is described below
commit 2188a544153d9c76b2bccd3f3d7ad59dfc5d2179
Author: Dillon Walls <[email protected]>
AuthorDate: Wed Apr 20 13:24:18 2022 -0400
fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
---
scripts/jenkins-python3.7.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/jenkins-python3.7.sh b/scripts/jenkins-python3.7.sh
index 9e3616395..ee38472e7 100755
--- a/scripts/jenkins-python3.7.sh
+++ b/scripts/jenkins-python3.7.sh
@@ -21,7 +21,7 @@
IMAGE_TAG=allura
# this fixes the input device is not a TTY .. see
https://github.com/docker/compose/issues/5696
-export COMPOSE_INTERACTIVE_NO_CLI=1
+# export COMPOSE_INTERACTIVE_NO_CLI=1
echo
echo
"============================================================================="
@@ -72,7 +72,7 @@ echo
echo
"============================================================================="
echo "Docker Container Info:"
echo
"============================================================================="
-docker-compose exec web bash -c '
+docker-compose exec -T web bash -c '
echo python path: `which python; python -V`;
echo python3.7 path: `which python3.7; python3.7 -V`;
git --version;
@@ -86,7 +86,7 @@ echo
"==========================================================================
echo "Setup: tests"
echo
"============================================================================="
# set up test dependencies
-docker-compose exec web pip install -q -r requirements-dev.txt
+docker-compose exec -T web pip install -q -r requirements-dev.txt
echo
echo
"============================================================================="
@@ -94,11 +94,11 @@ echo "Run: tests"
echo
"============================================================================="
# use "Allura* Forge* scripts" instead of "." so that .allura-venv doesn't get
checked too (and '.' gives './' prefixed results which don't work out)
-docker-compose exec web pyflakes Allura* Forge* scripts | awk -F\: '{printf
"%s:%s: [E]%s\n", $1, $2, $3}' > pyflakes.txt
-docker-compose exec web pycodestyle Allura* Forge* scripts > pep8.txt
+docker-compose exec -T web pyflakes Allura* Forge* scripts | awk -F\: '{printf
"%s:%s: [E]%s\n", $1, $2, $3}' > pyflakes.txt
+docker-compose exec -T web pycodestyle Allura* Forge* scripts > pep8.txt
# TODO: ALLURA_VALIDATION=all
-docker-compose exec -e LANG=en_US.UTF-8 web ./run_tests --with-xunitmp #
--with-coverage --cover-erase
+docker-compose exec -T -e LANG=en_US.UTF-8 web ./run_tests --with-xunitmp #
--with-coverage --cover-erase
retcode=$?
find . -name .coverage -maxdepth 2 | while read coveragefile; do pushd
`dirname $coveragefile`; coverage xml --include='forge*,allura*'; popd; done;
