gitlab-qa 7.24.1 → 7.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d436d7dcc1ff54323d22b1ced1c4685c78b2ac4290e4deea6f4720b26c7bda
-  data.tar.gz: 8250c321d7130510768ea563bda98978f9ca53c6eac55344ad7475aa4c771324
+  metadata.gz: 862c31bca6760f872b719b43ff2acc508f5155af1ad8a8763ff9acec9097629f
+  data.tar.gz: fb705f83636c4702e7f307b5fa445146227bd81525f6bce14dcd82e1da225a2d
 SHA512:
-  metadata.gz: bc86efe53b8067cdf2bcf0788dc9c740bbdf32a8cb0be16d5c3dfee4e5b774f2c4f0ec4787169805d5ca04a075fd0ea3b35bca5b20ae5657906efc8be50eff80
-  data.tar.gz: 306ee5e2b20f62f50249a5741471a41904e071656b81168e11236398d3b9d3a933419055b84f7667dc23e642163a83ee66aee29c6f3cc0745251cbdcc5b3e696
+  metadata.gz: edd01e95ac436a768eaf06b6b84ef19b9e07a95067a8e48244cc96450168606741cd75c111517209a4a8c3d58ca41883684b76ad974426fae5b345fbdd15f8dc
+  data.tar.gz: d49d870521be04c0a729841c9bc51d6610049eac7df2274ff7f87d18cefe4f98bebede511982bd819e618c664b102578ddc152249ff1e3ad1f8e8db5717bec95

data/.gitlab/ci/danger.gitlab-ci.yml

@@ -0,0 +1,25 @@
+danger-review:
+  image: ruby:3.0
+  stage: check
+  rules:
+    - if: '$CI_MERGE_REQUEST_IID'
+  needs: []
+  retry:
+    max: 2
+    when:
+      - unknown_failure
+      - api_failure
+      - runner_system_failure
+      - stuck_or_timeout_failure
+  before_script:
+    - bundle install
+  script:
+    - >
+      if [ -z "$DANGER_GITLAB_API_TOKEN" ]; then
+        # Force danger to skip CI source GitLab and fallback to "local only git repo".
+        unset GITLAB_CI
+        # We need the base SHA of the merge request diff to help danger determine the base commit for this shallow clone.
+        bundle exec danger dry_run --fail-on-errors=true --verbose --base='$CI_MERGE_REQUEST_DIFF_BASE_SHA' --head='${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA:-$CI_COMMIT_SHA}'
+      else
+        bundle exec danger --fail-on-errors=true --verbose
+      fi

data/.gitlab-ci.yml

@@ -1384,8 +1384,7 @@ generate-knapsack-report:
 include:
   - local: .gitlab/ci/*.gitlab-ci.yml
   - project: 'gitlab-org/quality/pipeline-common'
-    file: '/ci/gem-release.yml'
-  - project: 'gitlab-org/quality/pipeline-common'
-    file: '/ci/allure-report.yml'
-  - project: 'gitlab-org/quality/pipeline-common'
-    file: '/ci/knapsack-report.yml'
+    file:
+      - '/ci/gem-release.yml'
+      - '/ci/allure-report.yml'
+      - '/ci/knapsack-report.yml'

data/Dangerfile

@@ -0,0 +1,9 @@
+require 'gitlab-dangerfiles'
+
+Gitlab::Dangerfiles.for_project(self) do |dangerfiles|
+  # Import all plugins from the gem
+  dangerfiles.import_plugins
+
+  # Import only a subset of rules
+  dangerfiles.import_dangerfiles(only: %w[changes_size commit_messages simple_roulette])
+end

data/gitlab-qa.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'climate_control', '~> 1.0.1'
+  spec.add_development_dependency 'gitlab-dangerfiles', '~> 2.10'
   spec.add_development_dependency 'gitlab-styles', '~> 6.2.1'
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/gitlab/qa/runtime/env.rb

@@ -149,12 +149,14 @@ module Gitlab
             value = env_var_name_if_defined(name) || send(attribute) # rubocop:disable GitlabSecurity/PublicSend
             vars[name] = value if value
           end
-          qa_variables = ENV.select { |k, _v| k.start_with?('QA_') }
+          qa_variables = ENV.each_with_object({}) do |(name, value), vars|
+            next unless name.start_with?('QA_')
 
-          {
-            **qa_variables,
-            **defined_variables
-          }
+            var_name = env_var_name_if_defined(name)
+            vars[name] = var_name if var_name
+          end
+
+          qa_variables.merge(defined_variables)
         end
 
         def debug?

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.24.1'
+    VERSION = '7.24.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.24.1
+  version: 7.24.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: gitlab-dangerfiles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: gitlab-styles
   requirement: !ruby/object:Gem::Requirement
@@ -204,12 +218,14 @@ files:
 - ".dockerignore"
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".gitlab/ci/danger.gitlab-ci.yml"
 - ".gitlab/ci/rules.gitlab-ci.yml"
 - ".gitlab/merge_request_templates/Release.md"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - CONTRIBUTING.md
+- Dangerfile
 - Gemfile
 - LICENSE
 - README.md