Merge pull request #21 from scheduleonce/Ultragroots/ONCEHUB-49478

Ultragroots/ONCEHUB-49478 adding merge status to staging-app2

Author: so-integrations

.lighthouse/jenkins-x/pullrequest.yaml

@@ -196,6 +196,30 @@ spec:
             fi
           image: ghcr.io/jenkins-x/builder-jx:2.1.155-779
           name: check-merge-disabled
+        - script: |
+            #!/usr/bin/env bash
+            TARGET_BRANCH='staging-app2'
+            if [[ $TARGET_BRANCH == $PULL_BASE_REF  ]]; then 
+                mkdir clean_merge_test 
+                cd clean_merge_test
+                git clone "https://github.com/scheduleonce/eslint-config-oncehub.git"
+                cd eslint-config-oncehub
+                git fetch origin $PULL_PULL_REF:source_branch
+                git checkout source_branch
+                git checkout qa
+                git config  user.email ${GIT_AUTHOR_NAME:-so-integrations}
+                git config  user.name ${GIT_AUTHOR_EMAIL:[email protected]}
+                echo "Merging source_banch into qa"
+                git merge --no-commit --no-ff source_branch
+                if [ $? = 1 ]; then
+                  echo "Please merge code to QA branch first"
+                  exit 1
+                fi
+              cd ../../
+              rm -rf clean_merge_test
+            fi
+          image: ghcr.io/jenkins-x/builder-jx:2.1.155-779
+          name: check-clean-merge-to-qa
         - args:
           - -c
           - 'mkdir -p $HOME; git config --global --add user.name ${GIT_AUTHOR_NAME:-so-integrations}; git config --global --add user.email ${GIT_AUTHOR_EMAIL:[email protected]}; git config --global credential.helper store; git clone $(params.REPO_URL) $(params.subdirectory); echo cloned url: $(params.REPO_URL) to dir: $(params.subdirectory);'