Merge pull request dmwm#1471 from arooshap/master

Fixing issue with the race conditions.

docker/frontend/Dockerfile

@@ -54,9 +54,9 @@ RUN crontab /data/crontab.txt
 ADD run.sh $WDIR/run.sh
 ADD monitor.sh $WDIR/monitor.sh
 ADD alerts.sh $WDIR/alerts.sh
-COPY authmap-prod.cron /tmp/authmap-prod.cron
-COPY authmap-preprod.cron /tmp/authmap-preprod.cron
-COPY authmap-test.cron /tmp/authmap-test.cron
+COPY authmap-prod.sh /tmp/authmap-prod.sh
+COPY authmap-preprod.sh /tmp/authmap-preprod.sh
+COPY authmap-test.sh /tmp/authmap-test.sh
 COPY copy_cron.sh $WDIR/copy_cron.sh
 
 

docker/frontend/authmap-preprod.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Print a message to indicate the script is running
+echo "authmap-preprod.sh is running"
+
+sleep $((RANDOM % 601))
+
+/data/srv/current/config/frontend/mkauthmap  -c /data/srv/current/config/frontend/mkauth.conf -o /data/srv/state/frontend/etc/authmap.json --cert /etc/robots/robotcert.pem --key /etc/robots/robotkey.pem --ca-cert /etc/ssl/certs/CERN-bundle.pem ; [ $? -ne 0 ] && /bin/bash /data/alerts.sh

docker/frontend/authmap-prod.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Print a message to indicate the script is running
+
+sleep $((RANDOM % 601))
+
+/data/srv/current/config/frontend/mkauthmap  -c /data/srv/current/config/frontend/mkauth.conf -o /data/srv/state/frontend/etc/authmap.json --cert /etc/robots/robotcert.pem --key /etc/robots/robotkey.pem --ca-cert /etc/ssl/certs/CERN-bundle.pem ; [ $? -ne 0 ] && /bin/bash /data/alerts.sh

docker/frontend/authmap-test.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Print a message to indicate the script is running
+sleep $((RANDOM % 901))
+
+/data/srv/current/config/frontend/mkauthmap  -c /data/srv/current/config/frontend/mkauth.conf -o /data/srv/state/frontend/etc/authmap.json --cert /etc/robots/robotcert.pem --key /etc/robots/robotkey.pem --ca-cert /etc/ssl/certs/CERN-bundle.pem ; [ $? -ne 0 ] && /bin/bash /data/alerts.sh

docker/frontend/copy_cron.sh

@@ -1,15 +1,15 @@
 if [ "$ENVIRONMENT" = "k8s-prod" ]; then
   # Copy the production cron file
   echo "Copying authmap-prod.cron"
-  cp /tmp/authmap-prod.cron /tmp/authmap.cron
+  echo "*/15 * * * * /tmp/authmap-prod.sh" > /tmp/authmap.cron
 elif [ "$ENVIRONMENT" = "k8s-preprod" ]; then
   # Copy the development cron file
   echo "Copying authmap-preprod.cron"
-  cp /tmp/authmap-preprod.cron /tmp/authmap.cron
+  echo "*/15 * * * * /tmp/authmap-preprod.sh" > /tmp/authmap.cron
 elif [[ "$ENVIRONMENT" == k8s-test* ]]; then
   # Copy the test cron file
   echo "Copying authmap-test.cron"
-  cp /tmp/authmap-test.cron /tmp/authmap.cron
+  echo "*/30 * * * * /tmp/authmap-test.sh" > /tmp/authmap.cron
 
 else
   echo "Unsupported environment: $ENVIRONMENT"