Browse Source

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 <brian@bstinson.com>
Brian Stinson 5 years ago
parent
commit
c256117673

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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 \