Further improve settings for extra tests from GitLab

lakedrops.yml

@@ -6,6 +6,7 @@ variables:
   DISABLE_CI_TEST_BACKSTOP: 1
   DISABLE_CI_TEST_INVENTORY: 1
   THEME_BUILD: 'yes'
+  SKIPTESTS: 'yes'
 
 include:
   - project: 'gitlab-ci-cd/drupal'
@@ -24,6 +25,17 @@ Check 4 Updates:
 Release:
   extends: '.createrelease'
 
+#Build Site:
+#  script:
+#    - echo "Placeholder"
+#  rules:
+#    - when: never
+#Build Theme:
+#  script:
+#    - echo "Placeholder"
+#  rules:
+#    - when: never
+
 LakeDrops:
   stage: execute
   variables:
@@ -33,6 +45,7 @@ LakeDrops:
     DEPLOYSCRIPT: ${DEPLOYSCRIPT}
     VERSIONPATTERN: ${VERSIONPATTERN}
     SKIPCONFIGIMPORT: ${SKIPCONFIGIMPORT}
+    SKIPTESTS: 'no'
   trigger:
     include:
       - project: 'gitlab-ci-cd/drupal'

test-and-deploy.yml

@@ -26,6 +26,7 @@ include:
     file: '/tests/lakedrops.yml'
     except:
       variables:
+        - $SKIPTESTS == "yes"
         - $INITIALINSTALL == "yes"
         - $DISABLE_CI_TESTS
   - project: gitlab-ci-cd/drupal
@@ -33,6 +34,7 @@ include:
     file: '/tests/gitlab.yml'
     except:
       variables:
+        - $SKIPTESTS == "yes"
         - $INITIALINSTALL == "yes"
         - $DISABLE_CI_TESTS
         - $DISABLE_GITLAB_CI_TESTS

tests/lakedrops.yml

 variables:
   DISABLE_CI_TEST_CODESTYLE: 0
+  DISABLE_CI_TEST_PHPUNIT: 0
+  DISABLE_CI_TEST_BEHAT: 0
   DISABLE_CI_TEST_BACKSTOP: 0
 
 .test_lakedrops_default: &test_lakedrops_default
@@ -9,18 +11,6 @@ variables:
   variables:
     GIT_STRATEGY: none
 
-Build Site:
-  script:
-    - echo "Placeholder"
-  rules:
-    - when: never
-
-Build Theme:
-  script:
-    - echo "Placeholder"
-  rules:
-    - when: never
-
 Test Code Style:
   <<: *test_lakedrops_default
   image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
@@ -63,8 +53,7 @@ Test PHPUnit:
   dependencies:
     - 'Build Site'
   rules:
-    - if: '$DISABLE_CI_TEST_PHPUNIT == "1"'
-      when: never
+    - if: '$DISABLE_CI_TEST_PHPUNIT != "1"'
 
 Test Behat:
   <<: *test_lakedrops_default
@@ -84,8 +73,7 @@ Test Behat:
   dependencies:
     - 'Build Site'
   rules:
-    - if: '$DISABLE_CI_TEST_BEHAT == "1"'
-      when: never
+    - if: '$DISABLE_CI_TEST_BEHAT != "1"'
 
 Test Backstop:
   <<: *test_lakedrops_default
@@ -103,5 +91,4 @@ Test Backstop:
     - 'Build Site'
     - 'Build Theme'
   rules:
-    - if: '$DISABLE_CI_TEST_BACKSTOP == "1"'
-      when: never
+    - if: '$DISABLE_CI_TEST_BACKSTOP 1= "1"'