diff --git a/bin/update_all_repos.sh b/bin/update_all_repos.sh index a751552..cad2d00 100755 --- 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 deleted file mode 100644 index 06019ab..0000000 --- a/docker/repo-update-cadist.cron +++ /dev/null @@ -1,4 +0,0 @@ -# Update cadist under /usr/local/repo/cadist -# Updates and errors go to /var/log/repo-update-cadist.{stdout,stderr} -0 * * * * root flock -n /var/lock/repo-update-cadist /usr/bin/repo-update-cadist -@reboot root flock -n /var/lock/repo-update-cadist /usr/bin/repo-update-cadist