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
commit 15c50c8ee85424d5274501a6029ff73557edc84d Author: Dillon Walls <[email protected]> AuthorDate: Mon Apr 25 12:07:49 2022 -0400 fixup! [#8427] fix for jenkins failing on forgegit --- Dockerfile | 2 -- scripts/jenkins-python3.7.sh | 20 +++----------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ce6336dd..2b2a9c0c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,8 +49,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ 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 5e02882e3..3746742a8 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 @@ svn --version; 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 @@ docker-compose exec -T web pip install -q -r requirements-dev.txt # 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 web bash -c "pycodestyle Allura* Forge* scripts > pep8.tx 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 "============================================================================="
