gitlab-qa 7.24.4 → 7.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86868c3764df21242c8600de6406579ebb747a7d8efcb1aa04393e49af8cf10d
-  data.tar.gz: bb659bc291814572d6fdb6f73b77ef6c8a57eb52d10d2412f96b8998f5ba166a
+  metadata.gz: 1d63cf60f15e33988af850fbe566a6f46d695f572083bfff13870598058aebaa
+  data.tar.gz: ccb96a5c450f8bb16d7c032953c3894f6ec9dcaec61a77d60484351e1db588d0
 SHA512:
-  metadata.gz: f4e796a110f8044e5eed1b99154672b6371ebb23c41b055e7302295bf2c1cfc5ea8c043c23040385a46340ad02bc07372d307e38e28f1585027047663a824be6
-  data.tar.gz: e77ffb360b79a845d000411b55748efa3e7bb4c0bdebfe725ee40dafddc75102cd9cdb86d2e0570c04edb9cad6fbe04193c55a84f35f1304697a505415e32ea6
+  metadata.gz: 451356306a538d083f628ccfaefc60c009374204ecbcf05865b88aa927b68a0bd52937229707b6c81744a4a8d41c65951edb585c956392b616f3fb373d360fcf
+  data.tar.gz: dd1eb4ba25977779838692dc7085d9a4b25f166217997775f016c07ceaee75259e7b7f3f8d86ef2d2c38cfe9195a7edd1b1d9c6150bd9d061b522b4aa66d0c57

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

data/.gitlab/issue_templates/Default.md

@@ -0,0 +1,13 @@
+<!--
+Before raising an issue to the GitLab issue tracker, please read through our guide for finding help to determine the best place to post:
+
+* https://about.gitlab.com/getting-help/
+
+If you are experiencing an issue when using GitLab.com, your first port of call should be the Community Forum. Your issue may have already been reported there by another user. Please check:
+
+* https://forum.gitlab.com/
+
+If you feel that your issue can be categorized as a reproducible bug or a feature proposal, please use one of the issue templates provided and include as much information as possible.
+
+Thank you for helping to make GitLab a better product.
+-->

data/.gitlab/merge_request_templates/Default.md

@@ -0,0 +1,46 @@
+## What does this MR do and why?
+
+_Describe in detail what your merge request does and why._
+
+<!--
+Please keep this description updated with any discussion that takes place so
+that reviewers can understand your intent. Keeping the description updated is
+especially important if they didn't participate in the discussion.
+-->
+
+## Screenshots or screen recordings 
+
+_These are strongly recommended to assist reviewers and reduce the time to merge your change._
+
+<!-- 
+Please include any relevant screenshots or screen recordings that will assist
+reviewers and future readers. If you need help visually verifying the change,
+please leave a comment and ping a GitLab reviewer, maintainer, or MR coach.
+-->
+
+## How to set up and validate locally 
+
+_Numbered steps to set up and validate the change are strongly suggested._
+
+<!-- 
+Example below:
+ 
+1. Enable the invite modal
+   ```ruby
+   Feature.enable(:invite_members_group_modal)
+   ```
+1. In rails console enable the experiment fully
+   ```ruby
+   Feature.enable(:member_areas_of_focus)
+   ```
+1. Visit any group or project member pages such as `http://127.0.0.1:3000/groups/flightjs/-/group_members`
+1. Click the `invite members` button.
+-->
+
+## MR acceptance checklist
+
+This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability. 
+
+* [ ] I have evaluated the [MR acceptance checklist](https://docs.gitlab.com/ee/development/code_review.html#acceptance-checklist) for this MR.
+
+/label ~QA ~Quality