Further improve settings for extra tests from GitLab

test-and-deploy.yml

@@ -126,14 +126,14 @@ stages:
     GIT_STRATEGY: none
 
 .test_lakedrops_default: &test_lakedrops_default
-  *test_default
+  <<: *test_default
   except:
     variables:
       - $INITIALINSTALL == "yes"
       - $DISABLE_CI_TESTS
 
 .test_gitlab_default: &test_gitlab_default
-  *test_default
+  <<: *test_default
   rules:
     - if: '$INITIALINSTALL == "yes"'
       when: never
@@ -364,7 +364,7 @@ stages:
     - 'Build Site'
 
 .codestyle:
-  *test_lakedrops_default
+  <<: *test_lakedrops_default
   image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
   script:
     - if [[ -f phpcs.xml ]]; then rm phpcs.xml; fi
@@ -384,7 +384,7 @@ stages:
       - $DISABLE_CI_TEST_CODESTYLE
 
 .phpunit:
-  *test_lakedrops_default
+  <<: *test_lakedrops_default
   stage: test
   image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
   script:
@@ -410,7 +410,7 @@ stages:
       - $DISABLE_CI_TEST_PHPUNIT
 
 .behat:
-  *test_lakedrops_default
+  <<: *test_lakedrops_default
   image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
   script:
     - if [[ -f behat.xml ]]; then rm behat.xml; fi
@@ -431,7 +431,7 @@ stages:
       - $DISABLE_CI_TEST_BEHAT
 
 .backstop:
-  *test_lakedrops_default
+  <<: *test_lakedrops_default
   image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
   script:
     - backstop test
@@ -565,7 +565,7 @@ stages:
 
 # ==================================== Code Quality
 code_quality:
-  *test_gitlab_default
+  <<: *test_gitlab_default
   variables:
     CODE_QUALITY_IMAGE: registry.lakedrops.com/docker/code-climate-drupal/code-climate-drupal
   artifacts:
@@ -577,34 +577,34 @@ code_quality:
 
 # ==================================== SAST
 bandit-sast:
-  *test_gitlab_default
+  <<: *test_gitlab_default
   rules:
     - if: $DISABLE_GITLAB_CI_TESTS_BANDIT_SAST
       when: never
 eslint-sast:
-  *test_gitlab_default
+  <<: *test_gitlab_default
   rules:
     - if: $DISABLE_GITLAB_CI_TESTS_ESLINT_SAST
       when: never
 nodejs-scan-sast:
-  *test_gitlab_default
+  <<: *test_gitlab_default
   rules:
     - if: $DISABLE_GITLAB_CI_TESTS_NODEJS_SCAN_SAST
       when: never
 phpcs-security-audit-sast:
-  *test_gitlab_default
+  <<: *test_gitlab_default
   rules:
     - if: $DISABLE_GITLAB_CI_TESTS_PHPCS_SECURITY_AUDIT_SAST
       when: never
 semgrep-sast:
-  *test_gitlab_default
+  <<: *test_gitlab_default
   rules:
     - if: $DISABLE_GITLAB_CI_TESTS_SEMGREP_SAST
       when: never
 
 # ==================================== Secret Detection
 secret_detection:
-  *test_gitlab_default
+  <<: *test_gitlab_default
   rules:
     - if: $DISABLE_GITLAB_CI_TESTS_SECRET_DETECTION
       when: never