From d10e24f15d2f5e5d14f36467a70e924d5d7d0184 Mon Sep 17 00:00:00 2001 From: "vishal.s.patel" Date: Wed, 24 May 2023 10:16:23 +1200 Subject: [PATCH 1/6] Updated the link to point to the dashboard --- lib/gitlab/qa/report/generate_test_session.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/qa/report/generate_test_session.rb b/lib/gitlab/qa/report/generate_test_session.rb index 0d801450..3ed7050e 100644 --- a/lib/gitlab/qa/report/generate_test_session.rb +++ b/lib/gitlab/qa/report/generate_test_session.rb @@ -266,7 +266,7 @@ module Gitlab <<~MARKDOWN.chomp ## Link to Grafana dashboard for run-type of #{Runtime::Env.qa_run_type} - * https://dashboards.quality.gitlab.net/d/kuNYMgDnz/test-run-metrics?orgId=1&refresh=1m&var-run_type=#{Runtime::Env.qa_run_type} + * https://dashboards.quality.gitlab.net/d/tR_SmBDVk/main-runs?orgId=1&refresh=1m&var-run_type#{Runtime::Env.qa_run_type} MARKDOWN end end -- GitLab From b57d701ca28137dc6568c354d564213ed85f7248 Mon Sep 17 00:00:00 2001 From: "vishal.s.patel" Date: Wed, 24 May 2023 10:21:10 +1200 Subject: [PATCH 2/6] updating the = operator --- lib/gitlab/qa/report/generate_test_session.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/qa/report/generate_test_session.rb b/lib/gitlab/qa/report/generate_test_session.rb index 3ed7050e..98610d08 100644 --- a/lib/gitlab/qa/report/generate_test_session.rb +++ b/lib/gitlab/qa/report/generate_test_session.rb @@ -266,7 +266,7 @@ module Gitlab <<~MARKDOWN.chomp ## Link to Grafana dashboard for run-type of #{Runtime::Env.qa_run_type} - * https://dashboards.quality.gitlab.net/d/tR_SmBDVk/main-runs?orgId=1&refresh=1m&var-run_type#{Runtime::Env.qa_run_type} + * https://dashboards.quality.gitlab.net/d/tR_SmBDVk/main-runs?orgId=1&refresh=1m&var-run_type=#{Runtime::Env.qa_run_type} MARKDOWN end end -- GitLab From 584f4fc3f836a42be78ddd4fe4bf0b77a9ef24ed Mon Sep 17 00:00:00 2001 From: "vishal.s.patel" Date: Wed, 24 May 2023 11:13:05 +1200 Subject: [PATCH 3/6] reverting changes --- lib/gitlab/qa/report/generate_test_session.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/qa/report/generate_test_session.rb b/lib/gitlab/qa/report/generate_test_session.rb index 98610d08..0d801450 100644 --- a/lib/gitlab/qa/report/generate_test_session.rb +++ b/lib/gitlab/qa/report/generate_test_session.rb @@ -266,7 +266,7 @@ module Gitlab <<~MARKDOWN.chomp ## Link to Grafana dashboard for run-type of #{Runtime::Env.qa_run_type} - * https://dashboards.quality.gitlab.net/d/tR_SmBDVk/main-runs?orgId=1&refresh=1m&var-run_type=#{Runtime::Env.qa_run_type} + * https://dashboards.quality.gitlab.net/d/kuNYMgDnz/test-run-metrics?orgId=1&refresh=1m&var-run_type=#{Runtime::Env.qa_run_type} MARKDOWN end end -- GitLab From 027bef8e998f6b9f23b9b9d31d9f4a05f84a8cb8 Mon Sep 17 00:00:00 2001 From: "vishal.s.patel" Date: Wed, 24 May 2023 11:27:03 +1200 Subject: [PATCH 4/6] Updated link as well as spec --- lib/gitlab/qa/report/generate_test_session.rb | 2 +- spec/gitlab/qa/report/generate_test_session_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/gitlab/qa/report/generate_test_session.rb b/lib/gitlab/qa/report/generate_test_session.rb index 0d801450..98610d08 100644 --- a/lib/gitlab/qa/report/generate_test_session.rb +++ b/lib/gitlab/qa/report/generate_test_session.rb @@ -266,7 +266,7 @@ module Gitlab <<~MARKDOWN.chomp ## Link to Grafana dashboard for run-type of #{Runtime::Env.qa_run_type} - * https://dashboards.quality.gitlab.net/d/kuNYMgDnz/test-run-metrics?orgId=1&refresh=1m&var-run_type=#{Runtime::Env.qa_run_type} + * https://dashboards.quality.gitlab.net/d/tR_SmBDVk/main-runs?orgId=1&refresh=1m&var-run_type=#{Runtime::Env.qa_run_type} MARKDOWN end end diff --git a/spec/gitlab/qa/report/generate_test_session_spec.rb b/spec/gitlab/qa/report/generate_test_session_spec.rb index 260b8a95..60eda0e8 100644 --- a/spec/gitlab/qa/report/generate_test_session_spec.rb +++ b/spec/gitlab/qa/report/generate_test_session_spec.rb @@ -108,7 +108,7 @@ describe Gitlab::QA::Report::GenerateTestSession do 'DEPLOY_ENVIRONMENT' => 'gstg', 'GITLAB_QA_ISSUE_URL' => 'https://example.com/qa/issue', 'GITLAB_CI_API_TOKEN' => 'ci_api_token', - 'QA_RUN_TYPE' => 'package-and-qa' + 'QA_RUN_TYPE' => 'e2e-package-and-test' } end @@ -204,9 +204,9 @@ describe Gitlab::QA::Report::GenerateTestSession do /relate https://example.com/qa/issue - ## Link to Grafana dashboard for run-type of package-and-qa + ## Link to Grafana dashboard for run-type of e2e-package-and-test - * https://dashboards.quality.gitlab.net/d/kuNYMgDnz/test-run-metrics?orgId=1&refresh=1m&var-run_type=package-and-qa + * https://dashboards.quality.gitlab.net/d/kuNYMgDnz/test-run-metrics?orgId=1&refresh=1m&var-run_type=e2e-package-and-test MARKDOWN stub_request(:post, 'https://gitlab.com/api/v4/projects/project/issues') -- GitLab From 81863e1738003cd2c693b1865e02cf54bf05b8a8 Mon Sep 17 00:00:00 2001 From: "vishal.s.patel" Date: Wed, 24 May 2023 11:32:26 +1200 Subject: [PATCH 5/6] updated link in the spec --- spec/gitlab/qa/report/generate_test_session_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/gitlab/qa/report/generate_test_session_spec.rb b/spec/gitlab/qa/report/generate_test_session_spec.rb index 60eda0e8..dc799acd 100644 --- a/spec/gitlab/qa/report/generate_test_session_spec.rb +++ b/spec/gitlab/qa/report/generate_test_session_spec.rb @@ -206,7 +206,7 @@ describe Gitlab::QA::Report::GenerateTestSession do ## Link to Grafana dashboard for run-type of e2e-package-and-test - * https://dashboards.quality.gitlab.net/d/kuNYMgDnz/test-run-metrics?orgId=1&refresh=1m&var-run_type=e2e-package-and-test + * https://dashboards.quality.gitlab.net/d/tR_SmBDVk/main-runs?orgId=1&refresh=1m&var-run_type==e2e-package-and-test MARKDOWN stub_request(:post, 'https://gitlab.com/api/v4/projects/project/issues') -- GitLab From ad3b58d2c43c6e94718ddf25aee7f47d547ae14b Mon Sep 17 00:00:00 2001 From: "vishal.s.patel" Date: Wed, 24 May 2023 11:35:47 +1200 Subject: [PATCH 6/6] removing extra = --- spec/gitlab/qa/report/generate_test_session_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/gitlab/qa/report/generate_test_session_spec.rb b/spec/gitlab/qa/report/generate_test_session_spec.rb index dc799acd..9fbc96b9 100644 --- a/spec/gitlab/qa/report/generate_test_session_spec.rb +++ b/spec/gitlab/qa/report/generate_test_session_spec.rb @@ -206,7 +206,7 @@ describe Gitlab::QA::Report::GenerateTestSession do ## Link to Grafana dashboard for run-type of e2e-package-and-test - * https://dashboards.quality.gitlab.net/d/tR_SmBDVk/main-runs?orgId=1&refresh=1m&var-run_type==e2e-package-and-test + * https://dashboards.quality.gitlab.net/d/tR_SmBDVk/main-runs?orgId=1&refresh=1m&var-run_type=e2e-package-and-test MARKDOWN stub_request(:post, 'https://gitlab.com/api/v4/projects/project/issues') -- GitLab