Github Actions separate to two jobs and staging

.github/actions/build-docker-image/action.yml

@@ -13,7 +13,7 @@ inputs:
     required: true
   PR_NUMBER:
     description: 'PR number'
-    required: true
+    required: false
 
 runs:
   using: "composite"
@@ -22,11 +22,18 @@ runs:
       id: build
       shell: bash
       run: |
-        echo "🏗️ Building Docker image for PR #${PR_NUMBER} (commit ${{ inputs.commit }})..."
+        PR_INFO=""
+        if [ -n "${PR_NUMBER}" ]; then
+          PR_INFO=" for PR #${PR_NUMBER}"
+        fi
+
+        echo "🏗️ Building Docker image${PR_INFO} (commit ${{ inputs.commit }})..."
 
         if cpflow build-image -a "${{ inputs.app_name }}" --commit="${{ inputs.commit }}" --org="${{ inputs.org }}"; then
-          echo "✅ Docker image build successful for PR #${PR_NUMBER} (commit ${{ inputs.commit }})"
+          image_tag="${{ inputs.org }}/${{ inputs.app_name }}:${{ inputs.commit }}"
+          echo "image_tag=${image_tag}" >> $GITHUB_OUTPUT
+          echo "✅ Docker image build successful${PR_INFO} (commit ${{ inputs.commit }})"
         else
-          echo "❌ Docker image build failed for PR #${PR_NUMBER} (commit ${{ inputs.commit }})"
+          echo "❌ Docker image build failed${PR_INFO} (commit ${{ inputs.commit }})"
           exit 1
         fi

.github/actions/validate-required-vars/action.yml

@@ -0,0 +1,28 @@
+name: 'Validate Required Variables'
+description: 'Validates that all required secrets and variables for Control Plane operations'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Validate Required Secrets and Variables
+      shell: bash
+      run: |
+        missing=()
+
+        # Check required secrets
+        if [ -z "$CPLN_TOKEN_STAGING" ]; then
+          missing+=("Secret: CPLN_TOKEN_STAGING")
+        fi
+
+        # Check required variables
+        if [ -z "$CPLN_ORG_STAGING" ]; then
+          missing+=("Variable: CPLN_ORG_STAGING")
+        fi
+        if [ -z "$REVIEW_APP_PREFIX" ]; then
+          missing+=("Variable: REVIEW_APP_PREFIX")
+        fi
+
+        if [ ${#missing[@]} -ne 0 ]; then
+          echo "Required secrets/variables are not set: ${missing[*]}"
+          exit 1
+        fi 

.github/workflows/delete-review-app.yml

@@ -5,6 +5,12 @@ on:
     types: [closed]
   issue_comment:
     types: [created]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'PR number to delete review app for'
+        required: true
+        type: string
 
 permissions:
   contents: read
@@ -15,8 +21,8 @@ permissions:
 env:
   CPLN_ORG: ${{ vars.CPLN_ORG_STAGING }}
   CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
-  APP_NAME: qa-react-webpack-rails-tutorial-pr-${{ github.event.pull_request.number || github.event.issue.number }}
-  PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
+  APP_NAME: ${{ vars.REVIEW_APP_PREFIX }}-pr-${{ github.event.pull_request.number || github.event.issue.number || inputs.pr_number }}
+  PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number || inputs.pr_number }}
 
 jobs:
   debug:
@@ -29,37 +35,15 @@ jobs:
        github.event.issue.pull_request && 
        github.event.comment.body == '/delete-review-app') ||
       (github.event_name == 'pull_request' && 
-       github.event.action == 'closed')
+       github.event.action == 'closed') ||
+      github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
 
     steps:
-      - name: Get PR number
-        id: pr
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const prNumber = context.payload.issue.number;
-            core.setOutput('pr_number', prNumber);
-            core.exportVariable('PR_NUMBER', prNumber);
-
-      - name: Set App Name
-        run: echo "APP_NAME=qa-react-webpack-rails-tutorial-pr-${{ env.PR_NUMBER }}" >> $GITHUB_ENV
-
       - uses: actions/checkout@v4
 
-      - name: Validate Required Secrets
-        run: |
-          missing_secrets=()
-          for secret in "CPLN_TOKEN" "CPLN_ORG"; do
-            if [ -z "${!secret}" ]; then
-              missing_secrets+=("$secret")
-            fi
-          done
-
-          if [ ${#missing_secrets[@]} -ne 0 ]; then
-            echo "Required secrets are not set: ${missing_secrets[*]}"
-            exit 1
-          fi
+      - name: Validate Required Secrets and Variables
+        uses: ./.github/actions/validate-required-vars
 
       - name: Setup Environment
         uses: ./.github/actions/setup-environment