Add latest changes from gitlab-org/gitlab@16-3-stable-ee

2 files changed, 7 insertions, 1 deletions

diff --git a/qa/qa/specs/helpers/context_selector.rb b/qa/qa/specs/helpers/context_selector.rb
index 88b3efb84cb..3ef729c4500 100644
--- a/qa/qa/specs/helpers/context_selector.rb
+++ b/qa/qa/specs/helpers/context_selector.rb
@@ -121,7 +121,7 @@ module QA
         end
 
         def opts_tld
-          GitlabEdition.jh? ? '(.com|.hk)' : '.com'
+          GitlabEdition.jh? ? '(.com|.hk)' : '(.com|.net)'
         end
 
         def get_tld(host)
diff --git a/qa/spec/specs/helpers/context_selector_spec.rb b/qa/spec/specs/helpers/context_selector_spec.rb
index 3550e78d9e3..369ee60d31d 100644
--- a/qa/spec/specs/helpers/context_selector_spec.rb
+++ b/qa/spec/specs/helpers/context_selector_spec.rb
@@ -29,6 +29,12 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do
       expect(described_class.dot_com?).to be_truthy
     end
 
+    it 'returns true when url has .net' do
+      QA::Runtime::Scenario.define(:gitlab_address, "https://release.gitlab.net")
+
+      expect(described_class.context_matches?).to be_truthy
+    end
+
     it 'returns false when url does not have .com' do
       QA::Runtime::Scenario.define(:gitlab_address, "https://gitlab.test")