#308 adjust cleanup scripts for new name logic

.build/remove-snapshot-artifacts.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 echo "--------------------------------------------------------------------------------"
-echo ".... remove git tags"
+export PATTERN="SNAPSHOT"
+echo ".... remove git tags for pattern:$PATTERN"
 git fetch --tags
-tags=$(git tag | grep SNAPSHOT)
+tags=$(git tag | grep $PATTERN)
 echo $tags | xargs -n1 echo
 
 if [[ "$1" == "-y" ]]; then
@@ -19,10 +20,10 @@ else
   exit 0
 fi
 echo "--------------------------------------------------------------------------------"
-echo "... remove old SNAPSHOT zip and installer files?"
+echo "... remove old $PATTERN zip and installer files?"
 
-ssh sakuli@labs.consol.de -4 'ls /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.zip'
-ssh sakuli@labs.consol.de -4 'ls /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.jar'
+ssh sakuli@labs.consol.de -4 'ls /home/sakuli/htdocs/install/sakuli-v*-'"$PATTERN"'*.zip'
+ssh sakuli@labs.consol.de -4 'ls /home/sakuli/htdocs/install/sakuli-v*-'"$PATTERN"'*.jar'
 
 if [[ "$1" == "-y" ]]; then
     CONT="y"
@@ -32,7 +33,7 @@ else
 fi
 
 if [ "$CONT" = "y" ]; then
-    ssh sakuli@labs.consol.de -4 'rm /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.zip' || echo "do not fail if nothing have changed"
-    ssh sakuli@labs.consol.de -4 'rm /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.jar' || echo "do not fail if nothing have changed"
+    ssh sakuli@labs.consol.de -4 'rm /home/sakuli/htdocs/install/sakuli-v*-'"$PATTERN"'*.zip' || echo "do not fail if nothing have changed"
+    ssh sakuli@labs.consol.de -4 'rm /home/sakuli/htdocs/install/sakuli-v*-'"$PATTERN"'*.jar' || echo "do not fail if nothing have changed"
 fi
 

docker/.build/delete_dockerhub_tags.sh

@@ -15,7 +15,7 @@ IMAGES=(
     "consol/omd-labs-centos-sakuli"
     "consol/omd-labs-debian-sakuli"
 )
-PATTERN="-SNAPSHOT"
+PATTERN="SNAPSHOT"
 #PATTERN="v1.1.0-SNAPSHOT"
 
 logfile="docker.delete.images.log"