Merge branch 'main' into RE-1001_prime

cpanel · Dec 20, 2024 · 7ee2ee8 · 7ee2ee8
2 parents b60deb7 + fc47ef1
commit 7ee2ee8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/openstack-centos-7.yml b/.github/workflows/openstack-centos-7.yml
@@ -308,7 +308,7 @@ jobs:
               /scripts/status_marker 1
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep .5
-              REBOOT_STRING="Rebooting into stage 2 of 5" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Rebooting into stage 2 of 5" RETVAL/scripts/reboot_watch
 
     wait_for_stage_2_reboot:
       runs-on: self-hosted
@@ -373,7 +373,7 @@ jobs:
               /scripts/status_marker 2
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep .5
-              REBOOT_STRING="Rebooting into stage 3 of 5" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Rebooting into stage 3 of 5" RETVAL/scripts/reboot_watch
     
     wait_for_stage_3_reboot:
       runs-on: self-hosted
@@ -437,7 +437,7 @@ jobs:
               /scripts/status_marker 3
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep .5
-              REBOOT_STRING="Rebooting into stage 4 of 5" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Rebooting into stage 4 of 5" RETVAL/scripts/reboot_watch
 
     wait_for_stage_4_reboot:
       runs-on: self-hosted
@@ -501,7 +501,7 @@ jobs:
               /scripts/status_marker 4
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep .5
-              REBOOT_STRING="Rebooting into stage 5 of 5" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Rebooting into stage 5 of 5" RETVAL/scripts/reboot_watch
 
     wait_for_stage_5_reboot:
       runs-on: self-hosted

diff --git a/.github/workflows/openstack-ubuntu-20.yml b/.github/workflows/openstack-ubuntu-20.yml
@@ -309,7 +309,7 @@ jobs:
               /scripts/status_marker 1
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep .5
-              REBOOT_STRING="Rebooting into stage 2 of 5" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Rebooting into stage 2 of 5" RETVAL/scripts/reboot_watch
 
     wait_for_stage_2_reboot:
       runs-on: self-hosted
@@ -374,7 +374,7 @@ jobs:
               /scripts/status_marker 2
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep .5
-              REBOOT_STRING="Rebooting into stage 3 of 5" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Rebooting into stage 3 of 5" RETVAL/scripts/reboot_watch
     
     wait_for_stage_3_reboot:
       runs-on: self-hosted
@@ -438,7 +438,7 @@ jobs:
               /scripts/status_marker 3
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep .5
-              REBOOT_STRING="Rebooting into stage 4 of 5" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Rebooting into stage 4 of 5" RETVAL/scripts/reboot_watch
 
     wait_for_stage_4_reboot:
       runs-on: self-hosted
@@ -502,7 +502,7 @@ jobs:
               /scripts/status_marker 4
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep .5
-              REBOOT_STRING="Rebooting into stage 5 of 5" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Rebooting into stage 5 of 5" RETVAL/scripts/reboot_watch
 
     wait_for_stage_5_reboot:
       runs-on: self-hosted