diff --git a/test-and-deploy.yml b/test-and-deploy.yml index 990c4fed0057e45b8fe624bc00b19ada25e6deb8..93e00419a42daf55d2c017b30ee9861bbc9b072d 100644 --- a/test-and-deploy.yml +++ b/test-and-deploy.yml @@ -159,6 +159,12 @@ Debug: elif [[ "$CI_COMMIT_MESSAGE" == *"release into main"* ]]; then TESTSDISABLED="yes" GITLABTESTSDISABLED="yes" + elif [[ "$CI_COMMIT_MESSAGE" == *"Merge branch 'release' into 'main'"* ]]; then + TESTSDISABLED="yes" + GITLABTESTSDISABLED="yes" + elif [[ "$CI_COMMIT_MESSAGE" == *"Merge branch 'develop' into 'main'"* ]]; then + TESTSDISABLED="yes" + GITLABTESTSDISABLED="yes" elif [[ "$DISABLE_CI_TEST_BACKSTOP" == "1" && "$DISABLE_CI_TEST_BEHAT" == "1" && "$DISABLE_CI_TEST_CYPRESSE2E" == "1" ]]; then echo "DB not required" elif [[ "$CI_COMMIT_REF_NAME" == "main" ]]; then @@ -195,6 +201,7 @@ Debug: fi if [[ "$INITIALINSTALL" == "yes" ]]; then TESTSDISABLED="yes" + GITLABTESTSDISABLED="yes" fi DEPLOYSCRIPT="drupal-deploy"