Merge pull request #214 from RoanKanninga/master

last tweaks
molgenis · Jul 2, 2021 · 6090373 · 6090373
2 parents 47e89b6 + 5546749
commit 6090373
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/bin/pullRawDataFromDS.sh b/bin/pullRawDataFromDS.sh
@@ -217,7 +217,7 @@ else
 				gsBatchUploadCompleted='true'
 				logTimeStamp=$(date '+%Y-%m-%d-T%H%M')
 				rsync "${HOSTNAME_DATA_STAGING}:${GENOMESCAN_HOME_DIR}/${gsBatch}" \
-					> "/groups/${GROUP}/${TMP_LFS}/logs/${gsBatch}/${gsBatch}.uploadCompletedListing_${logTimeStamp}.log"
+					> "${logDir}/${gsBatch}.uploadCompletedListing_${logTimeStamp}.log"
 			fi
 			#
 			# Rsync everything but the .finished file: may be incompletely uploaded batch,

diff --git a/etc/leucine-zipper.cfg b/etc/leucine-zipper.cfg
@@ -4,7 +4,6 @@ SCR_LFS='scr01'
 DAT_LFS='dat06'
 HOSTNAME_PRM='chaperone.umcg.nl'
 HOSTNAME_TMP='leucine-zipper.umcg.nl'
-HOSTNAME_DATA_STAGING='cher-ami.hpc.rug.nl'
 declare -a ARRAY_OTHER_PRM_LFS_ISILON=(
 	'prm05'
 )
diff --git a/etc/umcg-genomescan.cfg b/etc/umcg-genomescan.cfg
@@ -1,7 +1,7 @@
 GROUP='umcg-genomescan'
 LAB='external'
 CLEANUP='true'
-GENOMESCAN_HOME_DIR="umcg-ndewater"
+GENOMESCAN_HOME_DIR="umcg-ndewater/"
 HOSTNAME_DATA_STAGING='medgendataxfer.ux.umcg.intra'
 declare -a NOTIFICATION_ORDER_PHASE_WITH_STATE=( 
 	'moveSamplesheets:failed'

diff --git a/etc/umcg-gst.cfg b/etc/umcg-gst.cfg
@@ -1,7 +1,7 @@
 GROUP='umcg-gst'
 LAB='external'
 CLEANUP='false'
-GENOMESCAN_HOME_DIR="umcg-retawedn"
+GENOMESCAN_HOME_DIR="umcg-retawedn/"
 HOSTNAME_DATA_STAGING='medgendataxfer.ux.umcg.intra'
 declare -a NOTIFICATION_ORDER_PHASE_WITH_STATE=( 
 	'moveSamplesheets:failed'

diff --git a/etc/zinc-finger.cfg b/etc/zinc-finger.cfg
@@ -4,7 +4,6 @@ SCR_LFS='scr01'
 DAT_LFS='dat05'
 HOSTNAME_PRM='coenzyme.umcg.nl'
 HOSTNAME_TMP='zinc-finger.gcc.rug.nl'
-HOSTNAME_DATA_STAGING='cher-ami.hpc.rug.nl'
 declare -a ARRAY_OTHER_PRM_LFS_ISILON=(
 	'prm06' 
 	'prm05'