Merge branch 'update-rules-name' into 'main-jh'

Update package-and-test to test-on-omnibus due to upstream change

See merge request gitlab-cn/gitlab!2759

jh/.gitlab/ci/not-run-if-jh.gitlab-ci.yml

-# Disable package-and-test-ee temp, we may bring it back later
-.qa:rules:package-and-test-ee:
+# Disable test-on-omnibus-ee temp, we may bring it back later
+.qa:rules:test-on-omnibus-ee:
   rules:
     - !reference [".not-run-if-jh", "rules"]
 
@@ -19,12 +19,12 @@
   rules:
     - !reference [".not-run-if-jh", "rules"]
 
-# Disable package-and-test-ce forever, we should not support ce edition
-.qa:rules:package-and-test-ce:
+# Disable test-on-omnibus-ce forever, we should not support ce edition
+.qa:rules:test-on-omnibus-ce:
   rules:
     - !reference [".not-run-if-jh", "rules"]
 
-.qa:rules:package-and-test-nightly:
+.qa:rules:test-on-omnibus-nightly:
   rules:
     - !reference [".not-run-if-jh", "rules"]
 

jh/.gitlab/ci/qa-common/variables.gitlab-ci.yml

-# Default variables for package-and-test
+# Default variables for test-on-omnibus
 
 variables:
   REGISTRY_HOST: "registry.jihulab.com"
@@ -8,7 +8,7 @@ variables:
   QA_LOG_LEVEL: "info"
   QA_TESTS: ""
   QA_FEATURE_FLAGS: ""
-  # run all tests by default when package-and-test is included natively in other projects
+  # run all tests by default when test-on-omnibus is included natively in other projects
   # this will be overridden when selective test execution is used in gitlab canonical project
   QA_RUN_ALL_TESTS: "true"
   USE_OLD_RUBY_VERSION: "true"