Add workflow dispatch to deployment workflows

Azure · Sep 4, 2024 · 0d082e0 · 0d082e0
1 parent 2600824
commit 0d082e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/aro-hcp-dev-env-cd.yml b/.github/workflows/aro-hcp-dev-env-cd.yml
@@ -8,6 +8,7 @@
     GLOBAL_RESOURCEGROUP: global
     ARO_HCP_IMAGE_ACR: arohcpdev
   on:
+    workflow_dispatch:
     pull_request:
       branches:
         - main
@@ -43,7 +44,7 @@
           run: core.setFailed('Expected source repository to be Azure/ARO-HCP, re-create PR as a branch of Azure/ARO-HCP')
 
     deploy_global_rg:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       permissions:
         id-token: 'write'
         contents: 'read'
@@ -75,7 +76,7 @@
                 --parameters configurations/mvp-dev-acr.bicepparam
 
     deploy_region_rg:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       permissions:
         id-token: 'write'
         contents: 'read'
@@ -119,7 +120,7 @@
                 --parameters globalResourceGroup="${REGIONAL_RESOURCEGROUP}"
 
     deploy_service_cluster_rg:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       needs:
         - deploy_region_rg
       permissions:
@@ -180,7 +181,7 @@
                 --grafana-resource-id "${GRAFANA_RESOURCE_ID}"
 
     deploy_management_cluster_rg:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       needs:
         - deploy_region_rg
       permissions:
@@ -333,7 +334,7 @@
             make push
 
     deploy_to_service_cluster:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       needs:
         - build_push_frontend
         - build_push_imagesync
@@ -425,7 +426,7 @@
             make deploy
 
     deploy_to_management_cluster:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       needs:
       - deploy_management_cluster_rg
       permissions:

diff --git a/.github/workflows/cs-integration-env-cd.yml b/.github/workflows/cs-integration-env-cd.yml
@@ -7,6 +7,7 @@
     MC_RESOURCEGROUP: cs-integ-westus3-mc-1
     ARO_HCP_IMAGE_ACR: arohcpdev
   on:
+    workflow_dispatch:
     pull_request:
       branches:
         - main
@@ -42,7 +43,7 @@
           run: core.setFailed('Expected source repository to be Azure/ARO-HCP, re-create PR as a branch of Azure/ARO-HCP')
 
     deploy_region_rg:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true  || github.event_name == 'workflow_dispatch'
       permissions:
         id-token: 'write'
         contents: 'read'
@@ -86,7 +87,7 @@
                 --parameters globalResourceGroup="${REGIONAL_RESOURCEGROUP}"
 
     deploy_service_cluster_rg:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       needs:
         - deploy_region_rg
       permissions:
@@ -147,7 +148,7 @@
                 --grafana-resource-id "${GRAFANA_RESOURCE_ID}"
 
     deploy_management_cluster_rg:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       needs:
         - deploy_region_rg
       permissions:
@@ -204,7 +205,7 @@
                 --grafana-resource-id "${GRAFANA_RESOURCE_ID}"
 
     deploy_to_service_cluster:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       needs:
         - deploy_service_cluster_rg
       permissions:
@@ -283,7 +284,7 @@
             make register-agent
 
     deploy_to_management_cluster:
-      if: github.event.pull_request.merged == true
+      if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
       needs:
       - deploy_management_cluster_rg
       permissions: