Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 9 deletions

diff --git a/qa/qa/support/system_logs/sentry.rb b/qa/qa/support/system_logs/sentry.rb
index a1bd53e7d7a..aee97f76931 100644
--- a/qa/qa/support/system_logs/sentry.rb
+++ b/qa/qa/support/system_logs/sentry.rb
@@ -5,10 +5,10 @@ module QA
     module SystemLogs
       class Sentry
         BASE_URLS = {
-          staging: 'https://sentry.gitlab.net/gitlab/staginggitlabcom/?environment=gstg',
-          staging_ref: 'https://sentry.gitlab.net/gitlab/staging-ref/?environment=all',
-          pre: 'https://sentry.gitlab.net/gitlab/pregitlabcom/?environment=all',
-          production: 'https://sentry.gitlab.net/gitlab/gitlabcom/?environment=gprd'
+          staging: 'https://new-sentry.gitlab.net/organizations/gitlab/issues/?environment=gstg&project=3',
+          staging_ref: 'https://new-sentry.gitlab.net/organizations/gitlab/issues/?environment=gstg-ref&project=3',
+          pre: 'https://new-sentry.gitlab.net/organizations/gitlab/issues/?environment=pre&project=3',
+          production: 'https://new-sentry.gitlab.net/organizations/gitlab/issues/?environment=gprd&project=3'
         }.freeze
 
         def initialize(env, correlation_id)
diff --git a/qa/spec/resource/api_fabricator_spec.rb b/qa/spec/resource/api_fabricator_spec.rb
index 96823ea7ada..b0b84d0b202 100644
--- a/qa/spec/resource/api_fabricator_spec.rb
+++ b/qa/spec/resource/api_fabricator_spec.rb
@@ -156,7 +156,7 @@ RSpec.describe QA::Resource::ApiFabricator do
               expect(error.to_s).to eql(<<~ERROR.chomp)
                 Fabrication of FooBarResource using the API failed (400) with `#{raw_post}`.
                 Correlation Id: foobar
-                Sentry Url: https://sentry.gitlab.net/gitlab/staginggitlabcom/?environment=gstg&query=correlation_id%3A%22foobar%22
+                Sentry Url: https://new-sentry.gitlab.net/organizations/gitlab/issues/?environment=gstg&project=3&query=correlation_id%3A%22foobar%22
                 Kibana - Discover Url: https://nonprod-log.gitlab.net/app/discover#/?_a=%28index:%27ed942d00-5186-11ea-ad8a-f3610a492295%27%2Cquery%3A%28language%3Akuery%2Cquery%3A%27json.correlation_id%20%3A%20foobar%27%29%29&_g=%28time%3A%28from%3A%272022-11-13T00:00:00.000Z%27%2Cto%3A%272022-11-14T00:00:00.000Z%27%29%29
                 Kibana - Dashboard Url: https://nonprod-log.gitlab.net/app/dashboards#/view/b74dc030-6f56-11ed-9af2-6131f0ee4ce6?_g=%28time%3A%28from:%272022-11-13T00:00:00.000Z%27%2Cto%3A%272022-11-14T00:00:00.000Z%27%29%29&_a=%28filters%3A%21%28%28query%3A%28match_phrase%3A%28json.correlation_id%3A%27foobar%27%29%29%29%29%29
               ERROR
diff --git a/qa/spec/support/system_logs/sentry_spec.rb b/qa/spec/support/system_logs/sentry_spec.rb
index 6821c527b23..937ce561b82 100644
--- a/qa/spec/support/system_logs/sentry_spec.rb
+++ b/qa/spec/support/system_logs/sentry_spec.rb
@@ -9,19 +9,19 @@ RSpec.describe QA::Support::SystemLogs::Sentry do
     subject { described_class.new(env, correlation_id).url }
 
     let(:staging_url) do
-      "https://sentry.gitlab.net/gitlab/staginggitlabcom/?environment=gstg&query=correlation_id%3A%22#{correlation_id}%22"
+      "https://new-sentry.gitlab.net/organizations/gitlab/issues/?environment=gstg&project=3&query=correlation_id%3A%22#{correlation_id}%22"
     end
 
     let(:staging_ref_url) do
-      "https://sentry.gitlab.net/gitlab/staging-ref/?environment=all&query=correlation_id%3A%22#{correlation_id}%22"
+      "https://new-sentry.gitlab.net/organizations/gitlab/issues/?environment=gstg-ref&project=3&query=correlation_id%3A%22#{correlation_id}%22"
     end
 
     let(:pre_url) do
-      "https://sentry.gitlab.net/gitlab/pregitlabcom/?environment=all&query=correlation_id%3A%22#{correlation_id}%22"
+      "https://new-sentry.gitlab.net/organizations/gitlab/issues/?environment=pre&project=3&query=correlation_id%3A%22#{correlation_id}%22"
     end
 
     let(:production_url) do
-      "https://sentry.gitlab.net/gitlab/gitlabcom/?environment=gprd&query=correlation_id%3A%22#{correlation_id}%22"
+      "https://new-sentry.gitlab.net/organizations/gitlab/issues/?environment=gprd&project=3&query=correlation_id%3A%22#{correlation_id}%22"
     end
 
     where(:env, :expected_url) do