Further improve settings for extra tests from GitLab

tests/gitlab.yml

@@ -12,8 +12,9 @@ include:
     - default
   variables:
     GIT_STRATEGY: none
+  needs: ['Build Prod Site']
   dependencies:
-    - 'Build Site'
+    - 'Build Prod Site'
 
 # ==================================== Code Quality
 code_quality:
@@ -21,9 +22,11 @@ code_quality:
   variables:
     GIT_STRATEGY: none
     CODE_QUALITY_IMAGE: registry.lakedrops.com/docker/code-climate-drupal/code-climate-drupal
-  needs: ['Build Site']
   artifacts:
+    name: code-quality
     paths: ['gl-code-quality-report.json']
+    reports:
+      codequality: gl-code-quality-report.json
   rules:
     - if: '$DISABLE_GITLAB_CI_TEST_CODE_QUALITY != "1"'
 
@@ -31,35 +34,50 @@ code_quality:
 bandit-sast:
   <<: *test_gitlab_default
   artifacts:
+    name: bandit-sast
     paths: ['gl-sast-report.json']
+    reports:
+      sast: gl-sast-report.json
   rules:
     - if: '$DISABLE_GITLAB_CI_TEST_BANDIT_SAST != "1"'
 
 eslint-sast:
   <<: *test_gitlab_default
   artifacts:
+    name: esllint-sast
     paths: ['gl-sast-report.json']
+    reports:
+      sast: gl-sast-report.json
   rules:
     - if: '$DISABLE_GITLAB_CI_TEST_ESLINT_SAST != "1"'
 
 nodejs-scan-sast:
   <<: *test_gitlab_default
   artifacts:
+    name: nodejs-scan-sast
     paths: ['gl-sast-report.json']
+    reports:
+      sast: gl-sast-report.json
   rules:
     - if: '$DISABLE_GITLAB_CI_TEST_NODEJS_SCAN_SAST != "1"'
 
 phpcs-security-audit-sast:
   <<: *test_gitlab_default
   artifacts:
+    name: phpcs-security-audit-sast
     paths: ['gl-sast-report.json']
+    reports:
+      sast: gl-sast-report.json
   rules:
     - if: '$DISABLE_GITLAB_CI_TEST_PHPCS_SECURITY_AUDIT_SAST != "1"'
 
 semgrep-sast:
   <<: *test_gitlab_default
   artifacts:
+    name: semgrep-sast
     paths: ['gl-sast-report.json']
+    reports:
+      sast: gl-sast-report.json
   rules:
     - if: '$DISABLE_GITLAB_CI_TEST_SEMGREP_SAST != "1"'
 
@@ -67,6 +85,9 @@ semgrep-sast:
 secret_detection:
   <<: *test_gitlab_default
   artifacts:
+    name: secret-detection
     paths: ['gl-secret-detection-report.json']
+    reports:
+      secret_detection: gl-secret-detection-report.json
   rules:
     - if: '$DISABLE_GITLAB_CI_TEST_SECRET_DETECTION != "1"'

tests/lakedrops.yml

@@ -5,6 +5,7 @@
   image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
   variables:
     GIT_STRATEGY: none
+  needs: ['Build Site']
   dependencies:
     - 'Build Site'
 
@@ -45,6 +46,11 @@ Test PHPUnit:
 
 Test Behat:
   <<: *test_lakedrops_default
+  needs:
+    - job: Import DB
+      optional: true
+    - job: Update DB
+      optional: true
   script:
     - if [[ -f behat.xml ]]; then rm behat.xml; fi
     - ahoy behat update
@@ -61,6 +67,11 @@ Test Behat:
 
 Test Backstop:
   <<: *test_lakedrops_default
+  needs:
+    - job: Import DB
+      optional: true
+    - job: Update DB
+      optional: true
   script:
     - backstop test
   artifacts: