diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /tooling | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
download | gitlab-ce-7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0.tar.gz |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'tooling')
-rw-r--r-- | tooling/config/CODEOWNERS.yml | 5 | ||||
-rw-r--r-- | tooling/danger/project_helper.rb | 7 | ||||
-rw-r--r-- | tooling/lib/tooling/helm3_client.rb | 2 | ||||
-rw-r--r-- | tooling/rspec_flaky/example.rb | 7 | ||||
-rw-r--r-- | tooling/rspec_flaky/flaky_example.rb | 12 | ||||
-rw-r--r-- | tooling/rspec_flaky/listener.rb | 2 |
6 files changed, 24 insertions, 11 deletions
diff --git a/tooling/config/CODEOWNERS.yml b/tooling/config/CODEOWNERS.yml index 0fb336f3857..ed712f18956 100644 --- a/tooling/config/CODEOWNERS.yml +++ b/tooling/config/CODEOWNERS.yml @@ -53,11 +53,14 @@ - '/app/finders/ci/auth_job_finder.rb' - '/ee/config/metrics/' - '/lib/gitlab/conan_token.rb' + - 'token_access/' + - 'pipelines/' + - 'ci/runner/' patterns: - '%{keyword}' '[Compliance]': - '@gitlab-org/manage/compliance': + '@gitlab-org/govern/compliance': entries: - '/ee/app/services/audit_events/build_service.rb' - '/ee/spec/services/audit_events/custom_audit_event_service_spec.rb' diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb index e98ae156246..a69d9049035 100644 --- a/tooling/danger/project_helper.rb +++ b/tooling/danger/project_helper.rb @@ -21,6 +21,10 @@ module Tooling %r{\Aglfm_specification/.+prosemirror_json\.yml} => [:frontend], %r{\Aglfm_specification/.+\.yml} => [:frontend, :backend], + # API auto generated doc files and schema (must come before generic docs regex) + %r{\Adoc/api/graphql/reference/} => [:docs, :backend], + %r{\Adoc/api/openapi/.*\.yaml\z} => [:docs, :backend], + [%r{usage_data\.rb}, %r{^(\+|-).*\s+(count|distinct_count|estimate_batch_distinct_count)\(.*\)(.*)$}] => [:database, :backend, :product_intelligence], %r{\A((ee|jh)/)?config/feature_flags/} => :feature_flag, @@ -166,9 +170,6 @@ module Tooling %r{\A((ee|jh)/)?changelogs/} => :none, %r{\Alocale/gitlab\.pot\z} => :none, - # GraphQL auto generated doc files and schema - %r{\Adoc/api/graphql/reference/} => :backend, - # Fallbacks in case the above patterns miss anything %r{\.rb\z} => :backend, %r{( diff --git a/tooling/lib/tooling/helm3_client.rb b/tooling/lib/tooling/helm3_client.rb index 82ebe3f51dc..d83dbeac76b 100644 --- a/tooling/lib/tooling/helm3_client.rb +++ b/tooling/lib/tooling/helm3_client.rb @@ -37,7 +37,6 @@ module Tooling def delete(release_name:) run_command([ 'uninstall', - %(--namespace "#{namespace}"), release_name ]) end @@ -60,7 +59,6 @@ module Tooling def raw_releases(page, args = []) command = [ 'list', - %(--namespace "#{namespace}"), %(--max #{PAGINATION_SIZE}), %(--offset #{PAGINATION_SIZE * page}), %(--output json), diff --git a/tooling/rspec_flaky/example.rb b/tooling/rspec_flaky/example.rb index e6c2f838194..8f369c99c5b 100644 --- a/tooling/rspec_flaky/example.rb +++ b/tooling/rspec_flaky/example.rb @@ -38,13 +38,18 @@ module RspecFlaky rspec_example.respond_to?(:attempts) ? rspec_example.attempts : 1 end + def feature_category + metadata[:feature_category] + end + def to_h { example_id: example_id, file: file, line: line, description: description, - last_attempts_count: attempts + last_attempts_count: attempts, + feature_category: feature_category } end diff --git a/tooling/rspec_flaky/flaky_example.rb b/tooling/rspec_flaky/flaky_example.rb index 299fcb567fc..3ce48ce1cd3 100644 --- a/tooling/rspec_flaky/flaky_example.rb +++ b/tooling/rspec_flaky/flaky_example.rb @@ -13,6 +13,7 @@ module RspecFlaky last_flaky_job last_attempts_count flaky_reports + feature_category ].freeze # This represents a flaky RSpec example and is mainly meant to be saved in a JSON file @@ -23,7 +24,8 @@ module RspecFlaky last_flaky_at: Time.now, last_flaky_job: nil, last_attempts_count: example_hash[:attempts], - flaky_reports: 0 + flaky_reports: 0, + feature_category: example_hash[:feature_category] }.merge(example_hash.slice(*ALLOWED_ATTRIBUTES)) %i[first_flaky_at last_flaky_at].each do |attr| @@ -31,11 +33,15 @@ module RspecFlaky end end - def update_flakiness!(last_attempts_count: nil) + def update!(example_hash) + attributes[:file] = example_hash[:file] + attributes[:line] = example_hash[:line] + attributes[:description] = example_hash[:description] attributes[:first_flaky_at] ||= Time.now attributes[:last_flaky_at] = Time.now attributes[:flaky_reports] += 1 - attributes[:last_attempts_count] = last_attempts_count if last_attempts_count + attributes[:feature_category] = example_hash[:feature_category] + attributes[:last_attempts_count] = example_hash[:last_attempts_count] if example_hash[:last_attempts_count] if ENV['CI_JOB_URL'] attributes[:last_flaky_job] = "#{ENV['CI_JOB_URL']}" diff --git a/tooling/rspec_flaky/listener.rb b/tooling/rspec_flaky/listener.rb index 9b20eefc2f0..3431d814a8a 100644 --- a/tooling/rspec_flaky/listener.rb +++ b/tooling/rspec_flaky/listener.rb @@ -27,7 +27,7 @@ module RspecFlaky return unless current_example.attempts > 1 flaky_example = suite_flaky_examples.fetch(current_example.uid) { RspecFlaky::FlakyExample.new(current_example.to_h) } - flaky_example.update_flakiness!(last_attempts_count: current_example.attempts) + flaky_example.update!(current_example.to_h) flaky_examples[current_example.uid] = flaky_example end |