update 'update_mirror' and 'new_mashfile' to handle osg-23 name patterns

osg-htc · Jul 26, 2023 · b3fd362 · b3fd362
1 parent e859336
commit b3fd362
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/bin/new_mashfile.sh b/bin/new_mashfile.sh
@@ -26,8 +26,8 @@ title () { python -c 'import sys; print sys.argv[1].title()' "$*" ; }
 
 TAG=$1
 case $TAG in
-  osg-3.*-upcoming-*-* ) IFS='-' read osg SERIES upcoming DVER REPO <<< "$TAG"
-                         SERIES+=-$upcoming ;;
+  osg-*-*-*-* ) IFS='-' read osg SERIES branch DVER REPO <<< "$TAG"
+                         SERIES+=-$branch ;;
   osg-*-*-* ) IFS='-' read osg SERIES DVER REPO <<< "$TAG" ;;
   devops-*-*) IFS='-' read SERIES DVER REPO <<< "$TAG" ;;
           * ) usage ;;

diff --git a/bin/update_mirror.py b/bin/update_mirror.py
@@ -9,6 +9,7 @@
 import socket
 import fcntl
 import errno
+import re
 
 def log(log):
     print("[%s]"%sys.argv[0], time.strftime("%a %m/%d/%y %H:%M:%S %Z: ", time.localtime()), log)
@@ -58,9 +59,9 @@ def lock(path):
     hostname="repo-itb.opensciencegrid.org"
 
 def tagsplit(tag):
-    if 'upcoming' in tag and tag.startswith("osg-3."):
-        series,_,dver,repo = tag.split('-')[-4:]
-        series += "-upcoming"
+    if re.match(r'osg-[0-9.]*-[a-z]*-el[0-9]+-[a-z]*', tag):
+        series,branch,dver,repo = tag.split('-')[-4:]
+        series += "-" + branch
     else:
         series,dver,repo = tag.split('-')[-3:]
     return series,dver,repo

diff --git a/bin/update_repo.sh b/bin/update_repo.sh
@@ -17,8 +17,6 @@ usage () {
 TAG=$1
 
 case $TAG in
-  osg-3.*-upcoming-*-* ) IFS='-' read osg SERIES upcoming DVER REPO <<< "$TAG"
-                         SERIES+=-$upcoming ;;
   osg-*-*-*-* ) IFS='-' read osg SERIES branch DVER REPO <<< "$TAG"
                          SERIES+=-$branch ;;
   osg-*-*-* ) IFS='-' read osg SERIES DVER REPO <<< "$TAG" ;;