Merge pull request #8 from vub-hpc/rhea

support multiple scratch systems
vub-hpc · Oct 27, 2023 · 9660967 · 9660967
2 parents 67e7bef + e118e11
commit 9660967
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/files/vscprompt.sh b/files/vscprompt.sh
@@ -1,7 +1,7 @@
 fixpathvsc(){
     path=$PWD
 
-    regex_scratch='^/theia/scratch/brussel/(.*)$'
+    regex_scratch='^/[^/]+/scratch/brussel/(.*)$'
     regex_home='^/vscmnt/'${VSC_INSTITUTE}'_[^/]+/_[^/]*(user|home)_'${VSC_INSTITUTE}'/(.*)$'
     regex_data='^/vscmnt/'${VSC_INSTITUTE}'_[^/]+/_[^/]*data_'${VSC_INSTITUTE}'/(.*)$'
 

diff --git a/tests/test_fixpathvsc.sh b/tests/test_fixpathvsc.sh
@@ -66,6 +66,7 @@ origpaths=(
     /vscmnt/brussel_pixiu_apps/_apps_brussel/CO7/skylake
     /fake/user/brussel/100/vsc10009
     /fake/vscmnt/brussel_pixiu_home/_user_brussel/100/vsc10009
+    /rhea/scratch/brussel/100/vsc10009
 )
 
 expectedpaths=(
@@ -85,6 +86,7 @@ expectedpaths=(
     /vscmnt/brussel_pixiu_apps/_apps_brussel/CO7/skylake
     /fake/user/brussel/100/vsc10009
     /fake/vscmnt/brussel_pixiu_home/_user_brussel/100/vsc10009
+    '$VSC_SCRATCH'
 )
 
 run_tests
@@ -113,6 +115,7 @@ origpaths=(
     /vscmnt/brussel_pixiu_apps/_apps_brussel/CO7/skylake
     /fake/user/brussel/100/vsc10009
     /fake/vscmnt/brussel_pixiu_home/_user_brussel/100/vsc10009
+    /rhea/scratch/brussel/100/vsc10009
 )
 
 expectedpaths=(
@@ -128,6 +131,7 @@ expectedpaths=(
     /vscmnt/brussel_pixiu_apps/_apps_brussel/CO7/skylake
     /fake/user/brussel/100/vsc10009
     /fake/vscmnt/brussel_pixiu_home/_user_brussel/100/vsc10009
+    '$VSC_SCRATCH'
 )
 
 run_tests
@@ -150,6 +154,7 @@ origpaths=(
     '/vscmnt/antwerpen_storage_data/_data_antwerpen/201/vsc20133'
     '/scratch/brussel/vo/000/bvo00002/vsc20133'
     '/theia/scratch/brussel/vo/000/bvo00002/vsc20133'
+    '/rhea/scratch/brussel/vo/000/bvo00002/vsc20133'
 )
 
 expectedpaths=(
@@ -159,6 +164,7 @@ expectedpaths=(
     '$VSC_DATA'
     '$VSC_SCRATCH'
     '$VSC_SCRATCH'
+    '$VSC_SCRATCH'
 )
 
 run_tests
@@ -183,6 +189,7 @@ origpaths=(
     '/vscmnt/gent_kyukon_data/_kyukon_data_gent/vo/000/gvo00002/vsc40002'
     '/scratch/brussel/vo/000/bvo00003/vsc40002'
     '/theia/scratch/brussel/vo/000/bvo00003/vsc40002'
+    '/rhea/scratch/brussel/vo/000/bvo00003/vsc40002'
 )
 
 expectedpaths=(
@@ -194,6 +201,7 @@ expectedpaths=(
     '$VSC_DATA_VO_USER'
     '$VSC_SCRATCH'
     '$VSC_SCRATCH'
+    '$VSC_SCRATCH'
 )
 
 run_tests
@@ -216,6 +224,7 @@ origpaths=(
     '/vscmnt/leuven_icts/_data_leuven/337/vsc33716'
     '/scratch/brussel/vo/000/bvo00004/vsc33716'
     '/theia/scratch/brussel/vo/000/bvo00004/vsc33716'
+    '/rhea/scratch/brussel/vo/000/bvo00004/vsc33716'
 )
 
 expectedpaths=(
@@ -225,6 +234,7 @@ expectedpaths=(
     '$VSC_DATA'
     '$VSC_SCRATCH'
     '$VSC_SCRATCH'
+    '$VSC_SCRATCH'
 )
 
 run_tests

diff --git a/vsc-profiles-brussel.spec b/vsc-profiles-brussel.spec
@@ -1,6 +1,6 @@
 Summary: brussel vsc profiles files
 Name: vsc-profiles-brussel
-Version: 1.40
+Version: 1.41
 Release: 1
 License: GPL
 Group: Applications/System
@@ -42,6 +42,8 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 27 2023 Ward Poelmans <[email protected]>
+- Adjust scratch regex to also support rhea scratch
 * Fri Sep 29 2023 Alex Domingo <[email protected]>
 - Avoid spurious extra colon in MODULEPATH
 * Mon Mar 27 2023 Samuel Moors <[email protected]>