Merge pull request #61 from mwestphall/SOFTWARE-4643-repo-update-cadi…

…st-in-update-all-repos SOFTWARE-4643: move repo-update-cadist call from cron job to update_all_repos.sh
osg-htc · Nov 6, 2023 · 0da102d · 0da102d
2 parents 03d20d9 + b708a29
commit 0da102d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/bin/update_all_repos.sh b/bin/update_all_repos.sh
@@ -57,6 +57,14 @@ done
 datemsg "Finished updating all mash repos."
 echo
 
+# Update cadist under /usr/local/repo/cadist
+# Updates and errors go to /var/log/repo-update-cadist.{stdout,stderr}
+datemsg "Running repo-update-cadist."
+if ! flock -n /var/lock/repo-update-cadist /usr/bin/repo-update-cadist ; then 
+  datemsg "repo-update-cadist failed."
+  failed=1
+fi
+
 # SOFTWARE-4420, SOFTWARE-4689: temporary upcoming symlink to 3.5-upcoming
 uplink=/usr/local/repo/osg/upcoming
 [[ -L $uplink ]] || ln -s 3.5-upcoming $uplink
@@ -66,5 +74,5 @@ if [[ $failed = 0 ]]; then
   echo $(date) > /usr/local/repo/osg/timestamp.txt
 fi
 
-exit $failed
 
+exit $failed
diff --git a/docker/repo-update-cadist.cron b/docker/repo-update-cadist.cron