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 5fcce41 Improving cleanup
5fcce41 is described below
commit 5fcce410ec8024d24592a463bf04d16208de8f6d
Author: Martin Stockhammer <[email protected]>
AuthorDate: Mon May 21 17:35:34 2018 +0200
Improving cleanup
---
Jenkinsfile-itest | 2 +-
src/ci/scripts/prepareWorkspace.sh | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest
index 72cde91..943f407 100644
--- a/Jenkinsfile-itest
+++ b/Jenkinsfile-itest
@@ -66,7 +66,7 @@ pipeline {
)
{
sh "chmod 755
./src/ci/scripts/prepareWorkspace.sh"
- sh "./src/ci/scripts/prepareWorkspace.sh"
+ sh "./src/ci/scripts/prepareWorkspace.sh -d
'.repository'"
// Needs a lot of time to reload the
repository files, try without cleanup
// Not sure, but maybe
// sh "rm -rf .repository"
diff --git a/src/ci/scripts/prepareWorkspace.sh
b/src/ci/scripts/prepareWorkspace.sh
index b79cd44..d0f45bb 100644
--- a/src/ci/scripts/prepareWorkspace.sh
+++ b/src/ci/scripts/prepareWorkspace.sh
@@ -25,6 +25,23 @@
ATTIC_DIRS="archiva-modules/archiva-base/archiva-indexer"
REMOVE_DIRS=".indexer"
+while [ ! -z "$1" ]; do
+ case "$1" in
+ -d)
+ shift
+ REPO_DIR=$1
+ shift
+ ;;
+ *)
+ shift
+ ;;
+ esac
+done
+
+if [ -d "${REPO_DIR}" ]; then
+ rm -rf "${REPO_DIR}"
+fi
+
for i in ${ATTIC_DIRS}; do
if [ "X${i}" != "X" -a -d ${i} ]; then
echo "Deleting directory ${i}"
--
To stop receiving notification emails like this one, please contact
[email protected].
