gitlab-qa 7.24.5 → 7.25.1

data/.gitlab/ci/jobs/service_ping_disabled.gitlab-ci.yml

@@ -0,0 +1,19 @@
+ce:service_ping_disabled:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"
+
+ee:service_ping_disabled:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"

data/.gitlab/ci/jobs/smtp.gitlab-ci.yml

@@ -0,0 +1,19 @@
+ce:smtp:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::SMTP"
+
+ee:smtp:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::SMTP"

data/.gitlab/ci/jobs/staging.gitlab-ci.yml

@@ -0,0 +1,10 @@
+staging:
+  script:
+    - unset EE_LICENSE
+    - 'echo "Running: bundle exec exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS"'
+    - bundle exec exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS
+  extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+  allow_failure: true

data/.gitlab/ci/jobs/update.gitlab-ci.yml

@@ -0,0 +1,60 @@
+ce:update-parallel:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+  parallel: 5
+
+ce:update:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
+ce:update-quarantine:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .quarantine
+    - .rspec-report-opts
+    - .update-scenario-script
+  variables:
+    QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
+
+ee:update-parallel:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+  parallel: 10
+
+ee:update:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
+ee:update-quarantine:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"

data/.gitlab/ci/rules.gitlab-ci.yml

@@ -2,19 +2,23 @@
 # Conditions #
 ##############
 .if-default-refs-or-ce: &if-default-refs-or-ce
-  if: '$RELEASE == null || $RELEASE =~ /gitlab-ce/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
+  if: '$RELEASE == null || $RELEASE == "" || $RELEASE =~ /gitlab-ce/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
 
 .if-default-refs-or-ee: &if-default-refs-or-ee
-  if: '$RELEASE == null || $RELEASE =~ /gitlab-ee/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
+  if: '$RELEASE == null || $RELEASE == "" || $RELEASE =~ /gitlab-ee/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
 
+.if-default-refs-or-ce-or-ee: &if-default-refs-or-ce-or-ee
+  if: '$RELEASE == null || $RELEASE == "" || $RELEASE =~ /gitlab-ce|gitlab-ee/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
+
+# In trigger jobs, such as `trigger-generated-jobs`, if a variable does not have a value set, the job will receive it literally as is i.e., "$RELEASE" in this case.
 .if-not-gitlab-qa-release: &if-not-gitlab-qa-release
-  if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
+  if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && ($RELEASE == null || $RELEASE == "" || $RELEASE == "$RELEASE")'
 
 .if-staging-and-not-release: &if-staging-and-not-release
-  if: '$RELEASE == null && $CI_JOB_NAME =~ /staging/'
+  if: '($RELEASE == null || $RELEASE == "") && $CI_JOB_NAME =~ /staging/'
 
 .if-quarantine-or-custom-and-not-release: &if-quarantine-or-custom-and-not-release
-  if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/'
+  if: '($RELEASE == null || $RELEASE == "") && $CI_JOB_NAME =~ /quarantine|custom/'
 
 .if-quarantine-or-custom-and-ee-release: &if-quarantine-or-custom-and-ee-release
   if: '$RELEASE =~ /gitlab-ee/ && $CI_JOB_NAME =~ /quarantine|custom/'
@@ -32,7 +36,7 @@
   if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/'
 
 .if-tag-or-release: &if-tag-or-release
-  if: '$CI_COMMIT_TAG || $RELEASE'
+  if: '$CI_COMMIT_TAG || ($RELEASE != null && $RELEASE != "")'
 
 .if-set-feature-flag: &if-set-feature-flag
   if: '$GITLAB_QA_OPTIONS =~ /--set-feature-flags/'
@@ -77,6 +81,15 @@
       when: manual
     - <<: *if-default-refs-or-ee
 
+.rules:never-on-version-change-or-tag:
+  rules:
+    - <<: *if-not-gitlab-qa-release
+      changes: ["lib/**/version.rb"]
+      when: never
+    - if: '$CI_COMMIT_TAG'
+      when: never
+    - <<: *if-default-refs-or-ce-or-ee
+
 .rules:only-qa:
   rules:
     - <<: *if-not-gitlab-qa-release