launchpad-reviewers team mailing list archive

[Ines Almeida <mp+493299@xxxxxxxxxxxxxxxxxx>]

Ines Almeida has proposed merging ~ines-almeida/launchpad:update-default-store-hostnames into launchpad:master.

Commit message:
Add production git urls for store hostnames
    
The default values included only staging URLs, and now include staging and production values

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/493299

Related to the recent feature rule change requested by Bowen Fan and approved by Yuliy
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ines-almeida/launchpad:update-default-store-hostnames into launchpad:master.

diff --git a/lib/lp/code/model/gitref.py b/lib/lp/code/model/gitref.py
index f7a426d..d6eacdc 100644
--- a/lib/lp/code/model/gitref.py
+++ b/lib/lp/code/model/gitref.py
@@ -1020,7 +1020,12 @@ def _get_store_hostnames():
     store_urls = getFeatureFlag("git_repository_url.store_hostnames")
     if store_urls:
         return store_urls.split(" ")
-    return ["git.staging.snapcraftcontent.com", "git.staging.pkg.store"]
+    return [
+        "git.staging.snapcraftcontent.com",
+        "git.staging.pkg.store",
+        "git.snapcraftcontent.com",
+        "git.pkg.store",
+    ]
 
 
 def _fetch_blob_from_store(repository_url, ref_path, filename):
diff --git a/lib/lp/code/model/tests/test_gitref.py b/lib/lp/code/model/tests/test_gitref.py
index da717ce..cab0f6d 100644
--- a/lib/lp/code/model/tests/test_gitref.py
+++ b/lib/lp/code/model/tests/test_gitref.py
@@ -508,7 +508,7 @@ class TestGitRefGetBlob(TestCaseWithFactory):
 
     @responses.activate
     def test_remote_store_branch(self):
-        url = "https://git.staging.snapcraftcontent.com/ubuntu/public/test";
+        url = "https://git.snapcraftcontent.com/ubuntu/public/test";
         ref = self.factory.makeGitRefRemote(
             repository_url=url,
             path="refs/heads/path",
diff --git a/lib/lp/services/features/flags.py b/lib/lp/services/features/flags.py
index d51143d..85a37d0 100644
--- a/lib/lp/services/features/flags.py
+++ b/lib/lp/services/features/flags.py
@@ -318,7 +318,8 @@ flag_info = sorted(
             "git_repository_url.store_hostnames",
             "space delimited",
             "Valid store hostnames to use as remote repositories",
-            "git.staging.snapcraftcontent.com git.staging.pkg.store",
+            "git.staging.snapcraftcontent.com git.staging.pkg.store "
+            "git.snapcraftcontent.com git.pkg.store",
             "",
             "",
         ),