diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-28 15:09:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-28 15:09:27 +0000 |
| commit | 3a25b40d5572a1de4220a9bd284025bf5be1d16b (patch) | |
| tree | 748ec93e09ada6def17ac87b4b8479dccab20d37 /qa | |
| parent | 22fd199237e247c36de5b982d444cedc194126e6 (diff) | |
| download | gitlab-ce-3a25b40d5572a1de4220a9bd284025bf5be1d16b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb | 4 | ||||
| -rw-r--r-- | qa/qa/tools/reliable_report.rb | 4 | ||||
| -rw-r--r-- | qa/spec/tools/reliable_report_spec.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb index a7fe9c7630e..82df0b23312 100644 --- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb +++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb @@ -225,8 +225,8 @@ module QA comment_diff = verify_comments(type, actual, expected) { - "missing_#{type}s": (expected.keys - actual.keys).map { |it| actual[it]&.slice(:title, :url) }.compact, - "extra_#{type}s": (actual.keys - expected.keys).map { |it| expected[it]&.slice(:title, :url) }.compact, + "missing_#{type}s": (expected.keys - actual.keys).map { |it| expected[it]&.slice(:title, :url) }.compact, + "extra_#{type}s": (actual.keys - expected.keys).map { |it| actual[it]&.slice(:title, :url) }.compact, "#{type}_comments": comment_diff } end diff --git a/qa/qa/tools/reliable_report.rb b/qa/qa/tools/reliable_report.rb index b3df6de3d54..08e87d994f8 100644 --- a/qa/qa/tools/reliable_report.rb +++ b/qa/qa/tools/reliable_report.rb @@ -341,7 +341,7 @@ module QA runs = records.count failed = records.count { |r| r.values["status"] == "failed" } - failure_rate = (failed.to_f / runs.to_f) * 100 + failure_rate = (failed.to_f / runs) * 100 result[stage][name] = { file: file, @@ -358,7 +358,7 @@ module QA # @return [String] def query(reliable) <<~QUERY - from(bucket: "#{Support::InfluxdbTools::INFLUX_TEST_METRICS_BUCKET}") + from(bucket: "#{Support::InfluxdbTools::INFLUX_MAIN_TEST_METRICS_BUCKET}") |> range(start: -#{range}d) |> filter(fn: (r) => r._measurement == "test-stats") |> filter(fn: (r) => r.run_type == "staging-full" or diff --git a/qa/spec/tools/reliable_report_spec.rb b/qa/spec/tools/reliable_report_spec.rb index f08af8a717a..c1ac5899279 100644 --- a/qa/spec/tools/reliable_report_spec.rb +++ b/qa/spec/tools/reliable_report_spec.rb @@ -56,7 +56,7 @@ describe QA::Tools::ReliableReport do def flux_query(reliable:) <<~QUERY - from(bucket: "e2e-test-stats") + from(bucket: "e2e-test-stats-main") |> range(start: -#{range}d) |> filter(fn: (r) => r._measurement == "test-stats") |> filter(fn: (r) => r.run_type == "staging-full" or |