Add staging branch

Signed-off-by: Moti Asayag <[email protected]> rh-pre-commit.version: 2.3.0 rh-pre-commit.check-secrets: ENABLED
rhdhorchestrator · Jun 23, 2024 · 5acfaa1 · 5acfaa1
1 parent 62fc922
commit 5acfaa1
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 17 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - main
+      - staging
     paths:
       - '**/*.sh'
       - .github/workflows/checks.yaml

diff --git a/.github/workflows/create-ocp-project.yaml b/.github/workflows/create-ocp-project.yaml
@@ -3,7 +3,9 @@ name: Create OCP project workflow container image and manifest push
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - staging
     paths:
       - 'create-ocp-project/**'
       - 'pipeline/**'

diff --git a/.github/workflows/escalation.yml b/.github/workflows/escalation.yml
@@ -3,7 +3,9 @@ name: Escalation workflow container image and manifest push
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - staging
     paths:
       - 'escalation/**'
       - 'pipeline/**'

diff --git a/.github/workflows/greeting.yml b/.github/workflows/greeting.yml
@@ -3,7 +3,9 @@ name: Greeting workflow container image and manifest push
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - staging
     paths:
       - 'greeting/**'
       - 'pipeline/**'

diff --git a/.github/workflows/jira-listener.yml b/.github/workflows/jira-listener.yml
@@ -3,7 +3,9 @@ name: Build and push jira-listener container image for Escalation workflow
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - staging
     paths:
       - 'escalation/jira-listener/**'
       - 'pipeline/**'

diff --git a/.github/workflows/m2k-func.yaml b/.github/workflows/m2k-func.yaml
@@ -9,7 +9,9 @@ on:
         default: true
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: 
+      - main
+      - staging
     paths:
       - 'move2kube/m2k-func/**'
       - 'pipeline/**'
@@ -96,7 +98,7 @@ jobs:
           git config --global user.name ${{ github.event.head_commit.author.name || github.triggering_actor }}
           gh repo clone $WF_CONFIG_REPO config-repo
           cd config-repo
-          git switch -c m2k-kfunc-autopr-$RANDOM
+          git switch -c m2k-kfunc-autopr-$RANDOM origin/staging
 
           ./hack/bump_chart_version.sh move2kube --bump-patch-version
 
@@ -115,7 +117,7 @@ jobs:
           echo "Automated PR from $PR_OR_COMMIT_URL" | git commit --amend --file=-
           git remote set-url origin https://${{ env.GH_TOKEN }}@github.com/$WF_CONFIG_REPO
           git push origin HEAD
-          gh pr create -f --title "m2k-kfunc: Automatic m2k-kfunc image tag bump" \
+          gh pr create --base staging -f --title "m2k-kfunc: Automatic m2k-kfunc image tag bump" \
             --body "
           Updating generated image tag for m2k-kfunc application
  

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -165,7 +165,7 @@ jobs:
           git config --global user.name ${{ github.event.head_commit.author.name || github.triggering_actor }}
           gh repo clone $WF_CONFIG_REPO config-repo
           cd config-repo
-          git switch -c ${{ inputs.workflow_id }}-autopr-$RANDOM
+          git switch -c ${{ inputs.workflow_id }}-autopr-$RANDOM origin/staging
 
           ./hack/bump_chart_version.sh ${{ inputs.workflow_id }} --bump-patch-version
 
@@ -184,7 +184,7 @@ jobs:
           echo "Automated PR from $PR_OR_COMMIT_URL" | git commit --amend --file=-
           git remote set-url origin https://${{ env.GH_TOKEN }}@github.com/$WF_CONFIG_REPO
           git push origin HEAD
-          gh pr create -f --title "${{ inputs.workflow_id }}: Automatic manifests generation" \
+          gh pr create --base staging -f --title "${{ inputs.workflow_id }}: Automatic manifests generation" \
             --body "
           Updating generated manifests for ${{ inputs.workflow_id }} workflow
  

diff --git a/.github/workflows/modify-vm-resources.yaml b/.github/workflows/modify-vm-resources.yaml
@@ -3,7 +3,9 @@ name: Modify VM resource workflow container image and manifest push
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - staging
     paths:
       - 'modify-vm-resources/**'
       - 'pipeline/**'

diff --git a/.github/workflows/move2kube-e2e.yaml b/.github/workflows/move2kube-e2e.yaml
@@ -5,6 +5,7 @@ on:
   pull_request_target:
     branches:
       - main
+      - staging
     paths:
       - 'move2kube/**'
       - 'pipeline/**'

diff --git a/.github/workflows/move2kube.yaml b/.github/workflows/move2kube.yaml
@@ -3,7 +3,9 @@ name: Move2kube workflow container image and manifest push
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: 
+      - main
+      - staging
     paths:
       - 'move2kube/**'
       - 'pipeline/**'

diff --git a/.github/workflows/mta-e2e.yaml b/.github/workflows/mta-e2e.yaml
@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - main
+      - staging
     paths:
       - 'mta/**'
       - 'pipeline/**'

diff --git a/.github/workflows/mta-v6.x-e2e.yaml b/.github/workflows/mta-v6.x-e2e.yaml
@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - main
+      - staging
     paths:
       - 'mta-v6.x/**'
       - 'pipeline/**'

diff --git a/.github/workflows/mta-v6.x.yml b/.github/workflows/mta-v6.x.yml
@@ -3,7 +3,9 @@ name: MTA v6.x workflow container image and manifest push
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - staging
     paths:
       - 'mta-v6.x/**'
       - 'pipeline/**'

diff --git a/.github/workflows/mta-v7.x-e2e.yaml b/.github/workflows/mta-v7.x-e2e.yaml
@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - main
+      - staging
     paths:
       - 'mta-v7.x/**'
       - 'pipeline/**'

diff --git a/.github/workflows/mta-v7.x.yml b/.github/workflows/mta-v7.x.yml
@@ -3,7 +3,9 @@ name: MTA v7.x workflow container image and manifest push
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - staging
     paths:
       - 'mta-v7.x/**'
       - 'pipeline/**'

diff --git a/.github/workflows/mta.yml b/.github/workflows/mta.yml
@@ -3,7 +3,9 @@ name: MTA workflow container image and manifest push
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - staging
     paths:
       - 'mta/**'
       - 'pipeline/**'

diff --git a/.github/workflows/request-vm-cnv.yaml b/.github/workflows/request-vm-cnv.yaml
@@ -3,7 +3,9 @@ name: Request VM creation using CNV workflow container image and manifest push
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - staging
     paths:
       - 'request-vm-cnv/**'
       - 'pipeline/**'

diff --git a/.github/workflows/workflow-executor.yml b/.github/workflows/workflow-executor.yml
@@ -88,4 +88,4 @@ jobs:
         PR_BODY+="\n\nThis PR was created automatically as a result of merging ${PR_OR_COMMIT_URL}"
 
         # Create the PR using the constructed body
-        gh pr create -f --title "${{ inputs.workflow_id }}: Automatic manifests generation" --body "${PR_BODY}"
+        gh pr create --base staging -f --title "${{ inputs.workflow_id }}: Automatic manifests generation" --body "${PR_BODY}"
diff --git a/scripts/push_manifests.sh b/scripts/push_manifests.sh
@@ -16,7 +16,7 @@ echo "Cloning ${DEPLOYMENT_REPO}"
 git clone https://github.com/"${DEPLOYMENT_REPO}" helm-repo
 cd helm-repo || exit
 
-git switch -c autopr-${RANDOM} origin/"${DEPLOYMENT_BRANCH}"
+git switch -c autopr-${RANDOM} origin/"${DEPLOYMENT_BRANCH}" origin/staging
 # We assume the kustomize project already exists, this is not part of the PR
 cp ../"${WORKFLOW_ID}"/manifests/* kustomize/"${WORKFLOW_ID}"/base
 # Applying image kustomization