You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by di...@apache.org on 2022/04/25 16:10:08 UTC
[allura] branch dw/8427 updated (67ffb8481 -> 15c50c8ee)
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a change to branch dw/8427
in repository https://gitbox.apache.org/repos/asf/allura.git
discard 67ffb8481 fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard e2b67eaf7 fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard ab03ad954 fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard 4a7a3246f fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard 4d8ca6d70 fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard d54c4a008 fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard e439b687c fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard 06d0cab64 fixup! fixup! fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard 4a410bbc0 fixup! fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard 5237feda2 fixup! fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard 53364db11 fixup! fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard 2188a5441 fixup! fixup! fixup! [#8427] fix jenkins failing on forgegit
discard 124ccca47 fixup! fixup! [#8427] fix jenkins failing on forgegit
discard 0967ae4d6 fixup! [#8427] fix jenkins failing on forgegit
discard 831eae816 [#8427] fix jenkins failing on forgegit
add 40d067a26 create .asf.yaml with:
add 119241b94 Add license header to .asf.yaml
new 8dd1b57a7 [#8427] fix for jenkins failing on forgegit
new 15c50c8ee fixup! [#8427] fix for jenkins failing on forgegit
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (67ffb8481)
\
N -- N -- N refs/heads/dw/8427 (15c50c8ee)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Allura/allura/config/environment.py => .asf.yaml | 32 ++++++++++++++++++------
Dockerfile | 2 --
scripts/jenkins-python3.7.sh | 20 +++------------
3 files changed, 28 insertions(+), 26 deletions(-)
copy Allura/allura/config/environment.py => .asf.yaml (57%)
[allura] 02/02: fixup! [#8427] fix for jenkins failing on forgegit
Posted by di...@apache.org.
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 <di...@slashdotmedia.com>
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 "============================================================================="
[allura] 01/02: [#8427] fix for jenkins failing on forgegit
Posted by di...@apache.org.
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 8dd1b57a7f16aae99d843125993bba3878a2d76a
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Wed Apr 20 12:01:13 2022 -0400
[#8427] fix for jenkins failing on forgegit
---
Dockerfile | 11 ++++++---
scripts/jenkins-python3.7.sh | 56 ++++++++++++++++++++++++++++++++++----------
2 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 340b3e09b..7ce6336dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,10 +21,13 @@ FROM ubuntu:18.04
# In order to get python3.7, we must add the deadsnakes apt repo, and install 3.7 specifically
RUN apt-get update \
&& apt-get install software-properties-common -y --no-install-recommends \
- && add-apt-repository ppa:deadsnakes/ppa
+ && add-apt-repository ppa:deadsnakes/ppa -y \
+ && add-apt-repository ppa:git-core/ppa -y \
+ && apt-get update
+
+RUN apt-get upgrade -y git
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
git-core \
python3.7 \
python3.7-venv \
@@ -46,6 +49,8 @@ RUN apt-get update \
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 1cf42179a..5e02882e3 100755
--- a/scripts/jenkins-python3.7.sh
+++ b/scripts/jenkins-python3.7.sh
@@ -20,18 +20,30 @@
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 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
@@ -41,36 +53,54 @@ echo "==========================================================================
rm -rf ./allura-data
git clean -f -x # remove test.log, nosetest.xml etc (don't use -d since it'd remove our venv dir)
+docker-compose down
+
echo
echo "============================================================================="
echo "Run: build docker image"
echo "============================================================================="
docker-compose build
+echo
+echo "============================================================================="
+echo "Setup: venv, pip, pysvn, ./rebuild-all.sh, npm, etc."
+echo "============================================================================="
+docker-compose run web scripts/init-docker-dev.sh
+
+echo
+echo "============================================================================="
+echo "Starting up docker containers"
+echo "============================================================================="
+docker-compose up -d web
+
echo
echo "============================================================================="
echo "Docker Container Info:"
echo "============================================================================="
-docker-compose run 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;
svn --version;
echo pip: `pip3 --version`;
-echo npm: `npm --version`;'
-
-echo
-echo "============================================================================="
-echo "Setup: venv, pip, pysvn, ./rebuild-all.sh, npm, etc."
-echo "============================================================================="
-docker-compose run web scripts/init-docker-dev.sh
+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
echo "============================================================================="
echo "Setup: tests"
echo "============================================================================="
# set up test dependencies
-docker-compose run web pip install -r requirements-dev.txt
+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 "============================================================================="
@@ -78,14 +108,14 @@ 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 run web pyflakes Allura* Forge* scripts | awk -F\: '{printf "%s:%s: [E]%s\n", $1, $2, $3}' > pyflakes.txt
-docker-compose run web pycodestyle Allura* Forge* scripts > pep8.txt
+docker-compose exec -T web bash -c "pyflakes Allura* Forge* scripts | awk -F\: '{printf \"%s:%s: [E]%s\n\", \$1, \$2, \$3}' > pyflakes.txt"
+docker-compose exec -T web bash -c "pycodestyle Allura* Forge* scripts > pep8.txt"
# TODO: ALLURA_VALIDATION=all
-docker-compose run -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;
+find . -name .coverage -maxdepth 2 | while read coveragefile; do pushd `dirname $coveragefile`; coverage xml --include='forge*,allura*'; popd; done;
echo
echo "============================================================================="