Debug

lakedrops-execute.yml

@@ -8,20 +8,19 @@ include:
   - project: gitlab-ci-cd/drupal
     ref: main
     file: /tests/lakedrops.yml
-    except:
-      variables:
-        - $INITIALINSTALL == "yes"
-        - $TESTSDISABLED == "yes"
-        - $DISABLE_CI_TESTS == "1"
+    rules:
+      - if: $INITIALINSTALL == "yes"
+        when: never
+      - if: $TESTSDISABLED == "no"
   - project: gitlab-ci-cd/drupal
     ref: main
     file: /tests/gitlab.yml
-    except:
-      variables:
-        - $INITIALINSTALL == "yes"
-        - $TESTSDISABLED == "yes"
-        - $DISABLE_CI_TESTS == "1"
-        - $DISABLE_GITLAB_CI_TESTS == "1"
+    rules:
+      - if: $INITIALINSTALL == "yes"
+        when: never
+      - if: $TESTSDISABLED == "yes"
+        when: never
+      - if: $GITLABTESTSDISABLED == "no"
 
 Build Prod Site:
   extends: '.build-prod'

lakedrops.yml

@@ -62,6 +62,7 @@ LakeDrops:
   variables:
     DBREQUIRED: ${DBREQUIRED}
     DEPLOYSCRIPT: ${DEPLOYSCRIPT}
+    GITLABTESTSDISABLED: ${GITLABTESTSDISABLED}
     INITIALINSTALL: ${INITIALINSTALL}
     RESETLOCALE: ${RESETLOCALE}
     SKIPCONFIGIMPORT: ${SKIPCONFIGIMPORT}

test-and-deploy.yml

@@ -126,6 +126,10 @@ Debug:
   script: |
     DBREQUIRED="no"
     TESTSDISABLED="no"
+    GITLABTESTSDISABLED="no"
+    if [[ "$DISABLE_GITLAB_CI_TESTS" == "1" ]]; then
+      GITLABTESTSDISABLED="yes"
+    fi
     if [[ "$DISABLE_CI_TESTS" == "1" ]]; then
       TESTSDISABLED="yes"
     elif [[ "$CI_COMMIT_REF_NAME" == "main" ]]; then
@@ -179,6 +183,7 @@ Debug:
 
     echo "DBREQUIRED=${DBREQUIRED}" > validation.env
     echo "TESTSDISABLED=${TESTSDISABLED}" >> validation.env
+    echo "GITLABTESTSDISABLED=${GITLABTESTSDISABLED}" >> validation.env
     echo "INITIALINSTALL=${INITIALINSTALL}" >> validation.env
     echo "DEPLOYSCRIPT=${DEPLOYSCRIPT}" >> validation.env
     echo "RESETLOCALE=${RESETLOCALE}" >> validation.env
@@ -335,7 +340,7 @@ Debug:
       when: never
     - if: '$INITIALINSTALL == "yes"'
       when: never
-    - if: '$TESTSDISABLED == "no"'
+    - if: '$TESTSDISABLED == "yes"'
       when: never
     - if: '$DISABLE_CI_TESTS != "1"'
 
@@ -365,7 +370,7 @@ Debug:
       when: never
     - if: '$INITIALINSTALL == "yes"'
       when: never
-    - if: '$TESTSDISABLED == "no"'
+    - if: '$TESTSDISABLED == "yes"'
       when: never
     - if: '$DISABLE_CI_TESTS != "1"'
 
@@ -394,7 +399,7 @@ Debug:
       when: never
     - if: '$INITIALINSTALL == "yes"'
       when: never
-    - if: '$TESTSDISABLED == "no"'
+    - if: '$TESTSDISABLED == "yes"'
       when: never
     - if: '$DISABLE_CI_TESTS != "1"'
   dependencies:
@@ -426,7 +431,7 @@ Debug:
       when: never
     - if: '$INITIALINSTALL == "yes"'
       when: never
-    - if: '$TESTSDISABLED == "no"'
+    - if: '$TESTSDISABLED == "yes"'
       when: never
     - if: '$DISABLE_CI_TESTS != "1"'
   dependencies:
@@ -451,7 +456,7 @@ Debug:
       when: never
     - if: '$INITIALINSTALL == "yes"'
       when: never
-    - if: '$TESTSDISABLED == "no"'
+    - if: '$TESTSDISABLED == "yes"'
       when: never
     - if: '$DISABLE_CI_TESTS != "1"'
   dependencies: