Trying out some debug magic

cpanel · Dec 19, 2024 · 45eb898 · 45eb898
1 parent 67e9f5a
commit 45eb898
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 5 deletions.
diff --git a/.github/workflows/openstack-centos-7.yml b/.github/workflows/openstack-centos-7.yml
@@ -44,6 +44,18 @@ jobs:
             working-directory: "${{ github.workspace }}/.github/workflows/openstack/centos-7"
         steps:
         - uses: actions/checkout@v4
+
+        - name: Dump all GitHub variables
+          run: |
+            echo "Dumping all GitHub variables:"
+            echo "github.ref: ${{ github.ref }}"
+            echo "github.ref_name: ${{ github.ref_name }}"
+            echo "github.job: ${{ github.job }}"
+            echo "github.workflow: ${{ github.workflow }}"
+            echo "github.triggering_actor: ${{ github.triggering_actor }}"
+            echo "github.event_name: ${{ github.event_name }}"
+            echo "github.event.repository.master_branch: ${{ github.event.repository.master_branch }}"
+
         - name: Terraform fmt
           id: fmt
           run: |
@@ -553,7 +565,7 @@ jobs:
               /scripts/status_marker 5
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep 2.5
-              SKIP_PID_CHECK=1 REBOOT_STRING="Doing final reboot" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Doing final reboot" RETVAL=1 /scripts/reboot_watch
 
     wait_for_final_reboot:
       runs-on: self-hosted

diff --git a/.github/workflows/openstack-cloudlinux-7.yml.disabled b/.github/workflows/openstack-cloudlinux-7.yml.disabled
@@ -18,6 +18,22 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  # secrets
+  TF_VAR_application_credential_id: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
+  TF_VAR_application_credential_secret: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
+  TF_VAR_ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
+  TF_VAR_ssh_public_key: ${{ secrets.SSH_PUBLIC_KEY }}
+
+  # vars
+  TF_VAR_os_auth_url: ${{ vars.OS_AUTH_URL }}
+  TF_VAR_os_auth_type: ${{ vars.OS_AUTH_TYPE }}
+  TF_VAR_os_identity_api_version: ${{ vars.OS_IDENTITY_API_VERSION }}
+  TF_VAR_os_interface: ${{ vars.OS_INTERFACE }}
+  TF_VAR_os_region_name: ${{ vars.OS_REGION_NAME }}
+
+  # github
+  TF_VAR_github_repository: ${{ github.repository }}
+  TF_VAR_github_run_id: ${{ github.run_id }}
   tf_working_directory: "${{ github.workspace }}/.github/workflows/openstack/cloudlinux-7"
 
 jobs: 
@@ -28,6 +44,18 @@ jobs:
             working-directory: "${{ github.workspace }}/.github/workflows/openstack/cloudlinux-7"
         steps:
         - uses: actions/checkout@v4
+
+        - name: Dump all GitHub variables
+          run: |
+            echo "Dumping all GitHub variables:"
+            echo "github.ref: ${{ github.ref }}"
+            echo "github.ref_name: ${{ github.ref_name }}"
+            echo "github.job: ${{ github.job }}"
+            echo "github.workflow: ${{ github.workflow }}"
+            echo "github.triggering_actor: ${{ github.triggering_actor }}"
+            echo "github.event_name: ${{ github.event_name }}"
+            echo "github.event.repository.master_branch: ${{ github.event.repository.master_branch }}"
+
         - name: Terraform fmt
           id: fmt
           run: |
@@ -550,7 +578,7 @@ jobs:
               /scripts/status_marker 5
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep 2.5
-              SKIP_PID_CHECK=1 REBOOT_STRING="Doing final reboot" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Doing final reboot" RETVAL=1 /scripts/reboot_watch
 
     wait_for_final_reboot:
       runs-on: self-hosted

diff --git a/.github/workflows/openstack-ubuntu-20.yml b/.github/workflows/openstack-ubuntu-20.yml
@@ -44,6 +44,19 @@ jobs:
             working-directory: "${{ github.workspace }}/.github/workflows/openstack/ubuntu-20.04"
         steps:
         - uses: actions/checkout@v4
+            # Step to dump all GitHub variables
+
+        - name: Dump all GitHub variables
+          run: |
+            echo "Dumping all GitHub variables:"
+            echo "github.ref: ${{ github.ref }}"
+            echo "github.ref_name: ${{ github.ref_name }}"
+            echo "github.job: ${{ github.job }}"
+            echo "github.workflow: ${{ github.workflow }}"
+            echo "github.triggering_actor: ${{ github.triggering_actor }}"
+            echo "github.event_name: ${{ github.event_name }}"
+            echo "github.event.repository.master_branch: ${{ github.event.repository.master_branch }}"
+    
         - name: Terraform fmt
           id: fmt
           run: |
@@ -553,7 +566,7 @@ jobs:
               /scripts/status_marker 5
               tail -n40 -F /var/log/elevate-cpanel.log &
               sleep 2.5
-              SKIP_PID_CHECK=1 REBOOT_STRING="Doing final reboot" RETVAL=1 /scripts/reboot_watch
+              REBOOT_STRING="Great SUCCESS" RETVAL=1 /scripts/reboot_watch
 
     wait_for_final_reboot:
       runs-on: self-hosted

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
@@ -50,6 +50,16 @@ jobs:
       image: cpanelos/perl-compiler:alma8-perl-v5.36.0
 
     steps:
+      - name: Dump all GitHub variables
+        run: |
+          echo "Dumping all GitHub variables:"
+          echo "github.ref: ${{ github.ref }}"
+          echo "github.ref_name: ${{ github.ref_name }}"
+          echo "github.job: ${{ github.job }}"
+          echo "github.workflow: ${{ github.workflow }}"
+          echo "github.triggering_actor: ${{ github.triggering_actor }}"
+          echo "github.event_name: ${{ github.event_name }}"
+          echo "github.event.repository.master_branch: ${{ github.event.repository.master_branch }}"
 
       - name: Setup PATH
         run: |
@@ -86,7 +96,8 @@ jobs:
       secrets: inherit
       if: >
         (github.event_name == 'pull_request' && github.base_ref == 'main') ||
-        (github.event_name == 'push' && github.ref == 'refs/heads/main')
+        (github.event_name == 'push' && github.ref == 'refs/heads/main') ||
+        (github.repository == 'cpanel/elevate-cpanel' && github.triggering_actor == 'davelcpanelnet')
 
 
 # We are disabling CloudLinux for the time being as it's considered undependable at this point on the CLoudLinux side
@@ -105,5 +116,6 @@ jobs:
       secrets: inherit
       if: >
         (github.event_name == 'pull_request' && github.base_ref == 'main') ||
-        (github.event_name == 'push' && github.ref == 'refs/heads/main')
+        (github.event_name == 'push' && github.ref == 'refs/heads/main') ||
+        (github.repository == 'cpanel/elevate-cpanel' && github.triggering_actor == 'davelcpanelnet')