diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /tooling | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
download | gitlab-ce-a7b3560714b4d9cc4ab32dffcd1f74a284b93580.tar.gz |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'tooling')
-rw-r--r-- | tooling/danger/project_helper.rb | 4 | ||||
-rw-r--r-- | tooling/lib/tooling/test_map_generator.rb | 7 | ||||
-rw-r--r-- | tooling/quality/test_level.rb | 1 | ||||
-rw-r--r-- | tooling/rspec_flaky/config.rb | 10 |
4 files changed, 17 insertions, 5 deletions
diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb index f49b8bf7f2a..eaf33608b83 100644 --- a/tooling/danger/project_helper.rb +++ b/tooling/danger/project_helper.rb @@ -45,6 +45,8 @@ module Tooling %r{\Adoc/.*(\.(md|png|gif|jpg|yml))\z} => :docs, %r{\A(CONTRIBUTING|LICENSE|MAINTENANCE|PHILOSOPHY|PROCESS|README)(\.md)?\z} => :docs, %r{\Adata/whats_new/} => :docs, + %r{\Adata/deprecations/} => :none, + %r{\Adata/removals/} => :none, %r{\A((ee|jh)/)?app/finders/(.+/)?integrations/} => [:integrations_be, :database, :backend], [%r{\A((ee|jh)/)?db/(geo/)?(migrate|post_migrate)/}, %r{(:integrations|:\w+_tracker_data)\b}] => [:integrations_be, :database, :migration], @@ -56,7 +58,7 @@ module Tooling ((ee|jh)/)?app/controllers/(.+/)?oauth/jira/.+ | ((ee|jh)/)?app/services/(.+/)?jira.+ | ((ee|jh)/)?app/workers/(.+/)?(propagate_integration.+|irker_worker\.rb) | - ((ee|jh)/)?lib/(.+/)?(atlassian|data_builder|hook_data)/.+ | + ((ee|jh)/)?lib/(.+/)?(atlassian|data_builder|hook_data|web_hooks)/.+ | ((ee|jh)/)?lib/(.+/)?.*integration.+ | ((ee|jh)/)?lib/(.+/)?api/v3/github\.rb | ((ee|jh)/)?lib/(.+/)?api/github/entities\.rb diff --git a/tooling/lib/tooling/test_map_generator.rb b/tooling/lib/tooling/test_map_generator.rb index 20e4ed8e405..f96f33ff074 100644 --- a/tooling/lib/tooling/test_map_generator.rb +++ b/tooling/lib/tooling/test_map_generator.rb @@ -12,7 +12,12 @@ module Tooling def parse(yaml_files) Array(yaml_files).each do |yaml_file| data = File.read(yaml_file) - _metadata, example_groups = data.split("---\n").reject(&:empty?).map { |yml| YAML.safe_load(yml, [Symbol]) } + metadata, example_groups = data.split("---\n").reject(&:empty?).map { |yml| YAML.safe_load(yml, [Symbol]) } + + if example_groups.nil? + puts "No examples in #{yaml_file}! Metadata: #{metadata}" + next + end example_groups.each do |example_id, files| files.each do |file| diff --git a/tooling/quality/test_level.rb b/tooling/quality/test_level.rb index 50cbc69beb2..624564ecd05 100644 --- a/tooling/quality/test_level.rb +++ b/tooling/quality/test_level.rb @@ -24,6 +24,7 @@ module Quality elastic elastic_integration experiments + events factories finders frontend diff --git a/tooling/rspec_flaky/config.rb b/tooling/rspec_flaky/config.rb index ea18a601c11..36e35671587 100644 --- a/tooling/rspec_flaky/config.rb +++ b/tooling/rspec_flaky/config.rb @@ -7,15 +7,19 @@ module RspecFlaky end def self.suite_flaky_examples_report_path - ENV['SUITE_FLAKY_RSPEC_REPORT_PATH'] || rails_path("rspec_flaky/suite-report.json") + ENV['FLAKY_RSPEC_SUITE_REPORT_PATH'] || rails_path("rspec/flaky/suite-report.json") end def self.flaky_examples_report_path - ENV['FLAKY_RSPEC_REPORT_PATH'] || rails_path("rspec_flaky/report.json") + ENV['FLAKY_RSPEC_REPORT_PATH'] || rails_path("rspec/flaky/report.json") end def self.new_flaky_examples_report_path - ENV['NEW_FLAKY_RSPEC_REPORT_PATH'] || rails_path("rspec_flaky/new-report.json") + ENV['NEW_FLAKY_RSPEC_REPORT_PATH'] || rails_path("rspec/flaky/new-report.json") + end + + def self.skipped_flaky_tests_report_path + ENV['SKIPPED_FLAKY_TESTS_REPORT_PATH'] || rails_path("rspec/flaky/skipped_flaky_tests_report.txt") end def self.rails_path(path) |