Further improve settings for extra tests from GitLab

test-and-deploy.yml

@@ -250,9 +250,9 @@ stages:
     name: build
     when: always
     <<: *artifact_paths
-  except:
-    variables:
-      - $DISABLE_CI_TESTS
+  rules:
+    - if: '$DISABLE_CI_TESTS == "1"'
+      when: never
 
 .theme:
   stage: build
@@ -278,9 +278,9 @@ stages:
       - $THEME_CSS_PATH
   dependencies:
     - 'Build Prod Site'
-  except:
-    variables:
-      - $THEME_BUILD != "yes"
+  rules:
+    - if: '$THEME_BUILD != "yes"'
+      when: never
 
 .dumpdb:
   stage: build
@@ -298,11 +298,13 @@ stages:
     when: always
     paths:
       - ${CI_PROJECT_NAME}.sql
-  except:
-    variables:
-      - $DBREQUIRED == "no"
-      - $INITIALINSTALL == "yes"
-      - $DISABLE_CI_TESTS
+  rules:
+    - if: '$DBREQUIRED == "no"'
+      when: never
+    - if: '$INITIALINSTALL == "yes"'
+      when: never
+    - if: '$DISABLE_CI_TESTS == "1"'
+      when: never
 
 .importdb:
   stage: prepare
@@ -319,11 +321,13 @@ stages:
     - drush updatedb
     - if [[ "${SKIPCONFIGIMPORT}" == "no" ]]; then drush config-import; fi
     - drush cr
-  except:
-    variables:
-      - $DBREQUIRED == "no"
-      - $INITIALINSTALL == "yes"
-      - $DISABLE_CI_TESTS
+  rules:
+    - if: '$DBREQUIRED == "no"'
+      when: never
+    - if: '$INITIALINSTALL == "yes"'
+      when: never
+    - if: '$DISABLE_CI_TESTS == "1"'
+      when: never
   dependencies:
     - 'Build Site'
     - 'Download DB'
@@ -340,11 +344,13 @@ stages:
     - drush updatedb
     - if [[ "${SKIPCONFIGIMPORT}" == "no" ]]; then drush config-import; fi
     - drush cr
-  except:
-    variables:
-      - $DBREQUIRED != "no"
-      - $INITIALINSTALL == "yes"
-      - $DISABLE_CI_TESTS
+  rules:
+    - if: '$DBREQUIRED == "no"'
+      when: never
+    - if: '$INITIALINSTALL == "yes"'
+      when: never
+    - if: '$DISABLE_CI_TESTS == "1"'
+      when: never
   dependencies:
     - 'Build Site'
 
@@ -388,9 +394,9 @@ stages:
   script:
     - ascr drupal-reset-locales ${CI_PROJECT_PATH} ${CI_COMMIT_REF_NAME}
   cache: {}
-  except:
-    variables:
-      - $RESETLOCALE == "no"
+  rules:
+    - if: '$RESETLOCALE == "no"'
+      when: never
 
 .createrelease:
   stage: release