update cron scripts

Author: nazunalika

cron/beta-8

@@ -5,7 +5,7 @@ rm -rf /etc/pungi-beta
 git clone https://git.rockylinux.org/rocky/pungi-rocky.git -b r8-beta /etc/pungi-beta
 ret_val=$?
 if [ "$ret_val" -ne 0 ]; then
-  echo "Git pull failed for beta pungi config" | mutt -e "set from=\"$FROM\"" \
+  echo "Git pull failed for beta pungi config" | mutt -e "set from=\"$FROMMAIL\"" \
     -e 'set envelope_from=yes' \
     -s "Git pull on /etc/pungi-beta failed" \
     [email protected]
@@ -17,7 +17,7 @@ ret_val=$?
 popd
 
 if [ "$ret_val" -eq 0 ]; then
-  pushd /root/sync-devel/sync
+  pushd /root/toolkit/sync
   RLVER=8 bash beta-release-sync-to-staging.sh
   popd
 fi

cron/lookahead-10

@@ -1,22 +1,24 @@
 #!/bin/bash
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin
 FROMMAIL="Compose Tracker <[email protected]>"
-pushd /etc/pungi-10-lh/scripts
+git clone https://git.rockylinux.org/rocky/pungi-rocky.git -b r10s /etc/pungi-lh-10
+rm -rf /etc/pungi-lh-10
+pushd /etc/pungi-lh-10/scripts || { echo "Pungi directory not found"; exit; }
 git pull
 ret_val=$?
 if [ "$ret_val" -ne 0 ]; then
-  echo "Git pull failed for LookAhead pungi config" | mutt -e "set from=\"$FROM\"" \
+  echo "Git pull failed for LookAhead pungi config" | mutt -e "set from=\"$FROMMAIL\"" \
     -e 'set envelope_from=yes' \
-    -s "Git pull on /etc/pungi-lh failed" \
+    -s "Git pull on /etc/pungi-lh-10 failed" \
     [email protected]
   exit 1
 fi
 bash produce-10-lookahead-full.sh
 ret_val=$?
-popd
+popd || { echo "Could not go back to the previous directory"; exit; }
 
 if [ "$ret_val" -eq 0 ]; then
-  pushd /root/sync-devel/sync
+  pushd /root/toolkit/sync || { echo "Toolkit directory not found"; exit; }
   RLVER=10 bash lh-release-sync-to-staging.sh
-  popd
+  popd || { echo "Could not go back to previous directory"; exit; }
 fi

cron/lookahead-8

@@ -16,7 +16,7 @@ ret_val=$?
 popd
 
 if [ "$ret_val" -eq 0 ]; then
-  pushd /root/sync-devel/sync
+  pushd /root/toolkit/sync
   RLVER=8 bash lh-release-sync-to-staging.sh
   popd
 fi

cron/stable-10

@@ -0,0 +1,23 @@
+#!/bin/bash
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin
+FROMMAIL="Compose Tracker <[email protected]>"
+rm -rf /etc/pungi-prod-10
+pushd /etc/pungi-prod-10/scripts || { echo "Pungi directory not found"; exit; }
+git pull
+ret_val=$?
+if [ "$ret_val" -ne 0 ]; then
+  echo "Git pull failed for LookAhead pungi config" | mutt -e "set from=\"$FROMMAIL\"" \
+    -e 'set envelope_from=yes' \
+    -s "Git pull on /etc/pungi-prod-10 failed" \
+    [email protected]
+  exit 1
+fi
+bash produce-10-full.sh
+ret_val=$?
+popd || { echo "Could not go back to the previous directory"; exit; }
+
+if [ "$ret_val" -eq 0 ]; then
+  pushd /root/toolkit/sync || { echo "Toolkit directory not found"; exit; }
+  RLVER=10 bash minor-release-sync-to-staging.sh
+  popd || { echo "Could not go back to previous directory"; exit; }
+fi

cron/stable-updates-8

@@ -7,7 +7,7 @@ rm -rf /mnt/compose/8_metadata
 git clone https://git.rockylinux.org/rocky/rocky-module-metadata.git -b r8 /mnt/compose/8_metadata
 ret_val=$?
 if [ "$ret_val" -ne 0 ]; then
-  echo "Git pull failed for prod pungi config" | mutt -e "set from=\"$FROM\"" \
+  echo "Git pull failed for prod pungi config" | mutt -e "set from=\"$FROMMAIL\"" \
     -e 'set envelope_from=yes' \
     -s "Git pull on /etc/pungi-prod failed" \
     [email protected]
@@ -19,7 +19,7 @@ ret_val=$?
 popd
 
 if [ "$ret_val" -eq 0 ]; then
-  pushd /root/sync-devel/sync
+  pushd /root/toolkit/sync
   RLVER=8 bash sync-to-staging.sh Rocky-devel
   RLVER=8 bash sync-to-staging.sh Extras
   RLVER=8 bash sync-to-staging.sh Rocky
@@ -29,7 +29,7 @@ if [ "$ret_val" -eq 0 ]; then
   python3.9 /usr/local/bin/apollo_tree -p $(pwd) -n 'Rocky Linux 8 $arch' -i Live -i Minimal -i devel -i extras -i images -i isos -i live -i metadata -i Devel -i plus -i nfv
   popd
 
-  pushd /root/sync-devel/sync
+  pushd /root/toolkit/sync
   RLVER=8 bash sign-repos-only.sh
   popd
 fi

cron/stable-updates-no-devel-8

@@ -18,7 +18,7 @@ ret_val=$?
 popd
 
 if [ "$ret_val" -eq 0 ]; then
-  pushd /root/sync-devel/sync
+  pushd /root/toolkit/sync
   #RLVER=8 bash sync-to-staging.sh Rocky-devel
   #RLVER=8 bash sync-to-staging.sh Extras
   RLVER=8 bash sync-to-staging.sh Rocky
@@ -28,7 +28,7 @@ if [ "$ret_val" -eq 0 ]; then
   python3.9 /usr/local/bin/apollo_tree -p $(pwd) -n 'Rocky Linux 8 $arch' -i Live -i Minimal -i devel -i extras -i images -i isos -i live -i metadata -i Devel -i plus -i nfv
   popd
 
-  pushd /root/sync-devel/sync
+  pushd /root/toolkit/sync
   RLVER=8 bash sign-repos-only.sh
   popd
 fi