canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+467378@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:publish-db-fix into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/467378
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:publish-db-fix into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-web/webcontrol/publish-db b/charms/focal/autopkgtest-web/webcontrol/publish-db
index cfda10f..726b4fe 100755
--- a/charms/focal/autopkgtest-web/webcontrol/publish-db
+++ b/charms/focal/autopkgtest-web/webcontrol/publish-db
@@ -22,7 +22,8 @@ sqlite3.paramstyle = "named"
 config = None
 db_con = None
 
-archive_url = "http://archive.ubuntu.com/ubuntu";
+# archive_url = "http://archive.ubuntu.com/ubuntu";
+archive_url = "http://ftpmaster.internal/ubuntu";
 components = ["main", "restricted", "universe", "multiverse"]
 
 
@@ -179,7 +180,7 @@ def get_sources(db_con, release):
                                 },
                             )
                 db_con.commit()
-            except urllib.error.HTTPError as e:
+            except (urllib.error.HTTPError, ConnectionResetError) as e:
                 if e.code == 304:
                     logging.debug("url {} not modified".format(url))