Fix #8809 (#8884)

* remove CHECK_TEST_RESULT variable

* add rule skip_check

* change SKIP_SUBMIT

* rectify

* fix condition

* use skip_check instead

* adding skip_submit in three jobs

* removing _SUITE and SUBMIT_ from variable keywords for clarity

.gitlab-ci.yml

@@ -13,13 +13,12 @@ variables:
   # https://docs.docker.com/build/cache/backends/
   DOCKER_TLS_CERTDIR: "/certs"
   DOCKER_BUILDKIT: 1
-  CHECK_TEST_RESULT: "false"
-  SUBMIT_STATUS_TRACKING: "true"
+  STATUS_TRACKING: "true"
   CLIENT_CONFIGURATION_VALIDATION: "true"
-  CLIENT_VALIDATION_SUITE: "true"
+  CLIENT_VALIDATION: "true"
   SKIP_BUILD: "false"
   SKIP_DEPLOY: "false"
-  SKIP_SUBMIT: "false" 
+  SKIP_SUBMIT: "false"
 
 # This key define variables which are later used in `!reference` tag in `rules`.
 # Ref https://docs.gitlab.com/ee/ci/jobs/index.html#hide-jobs
@@ -37,6 +36,9 @@ variables:
       when: never 
   skip_submit:
     - if: '$SKIP_SUBMIT == "true"'
+      when: never
+  skip_check:
+    - if: '$STATUS_TRACKING == "false" && $CLIENT_CONFIGURATION_VALIDATION == "false" && $CLIENT_VALIDATION == "false"'
       when: never 
 
 stages:
@@ -253,7 +255,8 @@ deploy_publisher_rucio:
 
 task_submission:
   rules:
-    - if: '$SUBMIT_STATUS_TRACKING == "true" || $CLIENT_VALIDATION_SUITE == "true" || $CLIENT_CONFIGURATION_VALIDATION == "true"'
+    - if: '$STATUS_TRACKING == "true" || $CLIENT_VALIDATION == "true" || $CLIENT_CONFIGURATION_VALIDATION == "true"'
+    - !reference [.default_rules, skip_check]
     - !reference [.default_rules, skip_submit]
     - !reference [.default_rules, default]
     - !reference [.default_rules, release]
@@ -267,9 +270,9 @@ task_submission:
     - export REST_Instance  # from .env
     - export ROOT_DIR
     - export CMSSW_release=CMSSW_13_0_2
-    - export Task_Submission_Status_Tracking=$SUBMIT_STATUS_TRACKING
+    - export Task_Submission_Status_Tracking=$STATUS_TRACKING
     - export Client_Configuration_Validation=$CLIENT_CONFIGURATION_VALIDATION
-    - export Client_Validation_Suite=$CLIENT_VALIDATION_SUITE
+    - export Client_Validation_Suite=$CLIENT_VALIDATION
     - bash -x cicd/gitlab/executeTests.sh
   cache:
     - key: $CI_PIPELINE_ID
@@ -293,8 +296,9 @@ task_submission:
 
 client_validation_suite:
   rules:
-    - if: '$CLIENT_VALIDATION_SUITE == "false"'
+    - if: '$CLIENT_VALIDATION == "false"'
       when: never
+    - !reference [.default_rules, skip_submit]
     - !reference [.default_rules, default]
     - !reference [.default_rules, release]
   stage: run_testsuite_CV
@@ -326,6 +330,7 @@ client_configuration_validation:
   rules:
     - if: '$CLIENT_CONFIGURATION_VALIDATION == "false"'
       when: never
+    - !reference [.default_rules, skip_submit]
     - !reference [.default_rules, default]
     - !reference [.default_rules, release]
   stage: run_testsuite_CCV
@@ -355,8 +360,9 @@ client_configuration_validation:
 
 check_test_result:
   rules:
-    - if: '$CHECK_TEST_RESULT == "false"'
-      when: never
+    - if: '$STATUS_TRACKING == "true" || $CLIENT_VALIDATION == "true" || $CLIENT_CONFIGURATION_VALIDATION == "true"'
+    - !reference [.default_rules, skip_check]
+    - !reference [.default_rules, skip_submit]
     - !reference [.default_rules, default]
     - !reference [.default_rules, release]
   stage: check_testsuite