Further improve settings for extra tests from GitLab

lakedrops.yml

@@ -7,6 +7,13 @@ variables:
   DISABLE_CI_TEST_INVENTORY: 1
   DISABLE_CI_TEST_PHPUNIT: 0
   DISABLE_GITLAB_CI_TESTS: 0
+  DISABLE_GITLAB_CI_TEST_BANDIT_SAST: 0
+  DISABLE_GITLAB_CI_TEST_CODE_QUALITY: 0
+  DISABLE_GITLAB_CI_TEST_ESLINT_SAST: 0
+  DISABLE_GITLAB_CI_TEST_NODEJS_SCAN_SAST: 0
+  DISABLE_GITLAB_CI_TEST_PHPCS_SECURITY_AUDIT_SAST: 0
+  DISABLE_GITLAB_CI_TEST_SECRET_DETECTION: 0
+  DISABLE_GITLAB_CI_TEST_SEMGREP_SAST: 0
   ENVIRONMENT_NAME: ${PROJECT_NAME}/$CI_COMMIT_REF_NAME
   ENVIRONMENT_URL: https://www.example.com/$SITE_NAME
   GITLAB_DOMAIN: gitlab.lakedrops.com

tests/gitlab.yml

@@ -23,39 +23,36 @@ code_quality:
     paths:
       - gl-code-quality-report.json
   rules:
-    - if: $DISABLE_GITLAB_CI_TESTS_CODE_QUALITY
-      when: never
+    - if: '$DISABLE_GITLAB_CI_TEST_CODE_QUALITY != "1"'
 
 # ==================================== SAST
 bandit-sast:
   <<: *test_gitlab_default
   rules:
-    - if: $DISABLE_GITLAB_CI_TESTS_BANDIT_SAST
-      when: never
+    - if: '$DISABLE_GITLAB_CI_TEST_BANDIT_SAST != "1"'
+
 eslint-sast:
   <<: *test_gitlab_default
   rules:
-    - if: $DISABLE_GITLAB_CI_TESTS_ESLINT_SAST
-      when: never
+    - if: '$DISABLE_GITLAB_CI_TEST_ESLINT_SAST != "1"'
+
 nodejs-scan-sast:
   <<: *test_gitlab_default
   rules:
-    - if: $DISABLE_GITLAB_CI_TESTS_NODEJS_SCAN_SAST
-      when: never
+    - if: '$DISABLE_GITLAB_CI_TEST_NODEJS_SCAN_SAST != "1"'
+
 phpcs-security-audit-sast:
   <<: *test_gitlab_default
   rules:
-    - if: $DISABLE_GITLAB_CI_TESTS_PHPCS_SECURITY_AUDIT_SAST
-      when: never
+    - if: '$DISABLE_GITLAB_CI_TEST_PHPCS_SECURITY_AUDIT_SAST != "1"'
+
 semgrep-sast:
   <<: *test_gitlab_default
   rules:
-    - if: $DISABLE_GITLAB_CI_TESTS_SEMGREP_SAST
-      when: never
+    - if: '$DISABLE_GITLAB_CI_TEST_SEMGREP_SAST != "1"'
 
 # ==================================== Secret Detection
 secret_detection:
   <<: *test_gitlab_default
   rules:
-    - if: $DISABLE_GITLAB_CI_TESTS_SECRET_DETECTION
-      when: never
+    - if: '$DISABLE_GITLAB_CI_TEST_SECRET_DETECTION != "1"'