This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new 71b40b7 Additional cleanup
71b40b7 is described below
commit 71b40b791e863d3579fca9eb40d4c9b6fe738297
Author: Martin Stockhammer <[email protected]>
AuthorDate: Mon May 21 19:38:19 2018 +0200
Additional cleanup
---
Jenkinsfile-itest | 2 +-
src/ci/scripts/prepareWorkspace.sh | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest
index 943f407..ffb1645 100644
--- a/Jenkinsfile-itest
+++ b/Jenkinsfile-itest
@@ -80,7 +80,7 @@ pipeline {
// -Pci-server: Profile for CI-Server
// -Pit-js: Run the selenium test
sh "mvn clean install -B -U
-Dmaven.test.skip=true -T2"
- sh "mvn clean install -B -V -U -e -fae
-Dmaven.compiler.fork=true -DmaxWaitTimeInMs=2000 -Pci-server -Pit-js
-DtrimStackTrace=false -pl :archiva-webapp-test"
+ sh "mvn clean install -B -V -U -e -fae
-Dmaven.compiler.fork=true -DmaxWaitTimeInMs=2000 -Pci-server -Pit-js
-DtrimStackTrace=false -Djava.io.tmpdir=.tmp -pl :archiva-webapp-test"
}
}
diff --git a/src/ci/scripts/prepareWorkspace.sh
b/src/ci/scripts/prepareWorkspace.sh
index d0f45bb..941a99e 100644
--- a/src/ci/scripts/prepareWorkspace.sh
+++ b/src/ci/scripts/prepareWorkspace.sh
@@ -24,6 +24,7 @@
##
ATTIC_DIRS="archiva-modules/archiva-base/archiva-indexer"
REMOVE_DIRS=".indexer"
+TMP_DIRECTORY=".tmp"
while [ ! -z "$1" ]; do
case "$1" in
@@ -38,8 +39,15 @@ while [ ! -z "$1" ]; do
esac
done
+if [ -e "${TMP_DIRECTORY}" ]; then
+ rm -rf "${TMP_DIRECTORY}"
+fi
+mkdir -p "${TMP_DIRECTORY}"
+
if [ -d "${REPO_DIR}" ]; then
rm -rf "${REPO_DIR}"
+else
+ echo "WARNING: Directory not found ${REPO_DIR}"
fi
for i in ${ATTIC_DIRS}; do
--
To stop receiving notification emails like this one, please contact
[email protected].
