diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2018-05-21 19:38:19 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2018-05-21 19:38:19 +0200 |
| commit | 71b40b791e863d3579fca9eb40d4c9b6fe738297 (patch) | |
| tree | e29cbdfc8b22e7f724dc920160a322d1827bb23f | |
| parent | 5fcce410ec8024d24592a463bf04d16208de8f6d (diff) | |
| download | archiva-71b40b791e863d3579fca9eb40d4c9b6fe738297.tar.gz archiva-71b40b791e863d3579fca9eb40d4c9b6fe738297.zip | |
Additional cleanup
| -rw-r--r-- | Jenkinsfile-itest | 2 | ||||
| -rw-r--r-- | src/ci/scripts/prepareWorkspace.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest index 943f407d0..ffb164595 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 d0f45bb68..941a99efc 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 |