From c256117673fdb58fed584d863307d457df6dbc49 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Feb 11 2019 15:27:35 +0000 Subject: CI: fix git-log to not page output Sometimes in strange tty situations (in a container that was started by an ssh session, within a jenkins workspace for example). Git gets confused about what it should do with its output and tries to be helpful about piping it to a pager. It shouldn't do that in the CI context because that blocks execution. Signed-off-by: Brian Stinson --- diff --git a/dev/containers/runtests_py2.sh b/dev/containers/runtests_py2.sh index b161b17..9bc6301 100644 --- a/dev/containers/runtests_py2.sh +++ b/dev/containers/runtests_py2.sh @@ -19,7 +19,7 @@ git merge --no-ff "proposed/$BRANCH" -m "Merge PR" echo "Running tests for branch $BRANCH of repo $REPO" echo "Last commits:" -git log -2 +git --no-pager log -2 fi python2 /pagure/runtests.py run -f --py2 diff --git a/dev/containers/runtests_py3.sh b/dev/containers/runtests_py3.sh index b36a14a..cefded8 100644 --- a/dev/containers/runtests_py3.sh +++ b/dev/containers/runtests_py3.sh @@ -19,7 +19,7 @@ git merge --no-ff "proposed/$BRANCH" -m "Merge PR" echo "Running tests for branch $BRANCH of repo $REPO" echo "Last commits:" -git log -2 +git --no-pager log -2 fi python3 /pagure/runtests.py run -f --py3 diff --git a/dev/containers/tox_py3.sh b/dev/containers/tox_py3.sh index d9c806d..3ba8447 100644 --- a/dev/containers/tox_py3.sh +++ b/dev/containers/tox_py3.sh @@ -19,7 +19,7 @@ git merge --no-ff "proposed/$BRANCH" -m "Merge PR" echo "Running tests for branch $BRANCH of repo $REPO" echo "Last commits:" -git log -2 +git --no-pager log -2 fi tox -v --sitepackages -e 'py34-flask100-ci' -- --results=results diff --git a/run_ci_tests_containers.sh b/run_ci_tests_containers.sh index 2104bd2..49da399 100644 --- a/run_ci_tests_containers.sh +++ b/run_ci_tests_containers.sh @@ -18,7 +18,7 @@ git merge --no-ff "proposed/$BRANCH" -m "Merge PR" echo "Running tests for branch $BRANCH of repo $REPO" echo "Last commits:" -git log -2 +git --no-pager log -2 fi podman build --rm -t pagure-f29-rpms-py3 \