fixup! [#8427] fix for jenkins failing on forgegit
diff --git a/Dockerfile b/Dockerfile
index 7ce6336..2b2a9c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,8 +49,6 @@
sudo \
&& rm -rf /var/lib/apt/lists/*
-# RUN git config --global --add safe.directory /allura/ForgeGit/forgegit/tests/data/*.git
-
# up-to-date version of node & npm
RUN curl --silent --location https://deb.nodesource.com/setup_10.x | sudo bash - && \
DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends nodejs
diff --git a/scripts/jenkins-python3.7.sh b/scripts/jenkins-python3.7.sh
index 5e02882..3746742 100755
--- a/scripts/jenkins-python3.7.sh
+++ b/scripts/jenkins-python3.7.sh
@@ -20,30 +20,21 @@
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
-
echo
echo "============================================================================="
echo "Jenkins Host Info:"
echo "============================================================================="
-touch "foo.txt"
echo -n 'cpu count: '; grep -c processor /proc/cpuinfo
echo hostname: `hostname --short`
echo whoami: `whoami`
echo NODE_NAME: $NODE_NAME
-echo docker:
-docker version
-echo docker compose:
-docker-compose version
+echo docker: `docker version`
+echo docker compose: `docker-compose version`
echo path: $PATH
echo workspace: $WORKSPACE
echo jenkins_home: $JENKINS_HOME
echo home: $HOME
echo pwd: `pwd`
-ls -lAh
-ls -lAh ./scripts/
-ls -lAh ../
env
echo
@@ -85,10 +76,6 @@
echo pip: `pip3 --version`;
echo npm: `npm --version`;
echo whoami: `whoami`;
-ls -lAh /allura;
-ls -lAh /allura/;
-ls -lAh /allura/ForgeGit/forgegit/tests/data/;
-ls -lAh /allura/ForgeGit/forgegit/tests/data/*.git;
'
echo
@@ -100,7 +87,6 @@
# make test git repos safe to run even though owned by different user
docker-compose exec -T web chown root:root -R /allura
-docker-compose exec -T web git config --global --add safe.directory '*'
echo
echo "============================================================================="
@@ -115,7 +101,7 @@
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;
+#find . -name .coverage -maxdepth 2 | while read coveragefile; do pushd `dirname $coveragefile`; coverage xml --include='forge*,allura*'; popd; done;
echo
echo "============================================================================="
