Browse Source

Additional cleanup

pull/46/head
Martin Stockhammer 6 years ago
parent
commit
71b40b791e
2 changed files with 9 additions and 1 deletions
  1. 1
    1
      Jenkinsfile-itest
  2. 8
    0
      src/ci/scripts/prepareWorkspace.sh

+ 1
- 1
Jenkinsfile-itest View File

@@ -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"

}
}

+ 8
- 0
src/ci/scripts/prepareWorkspace.sh View File

@@ -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

Loading…
Cancel
Save