Merge autopkgtest-cloud:launchpadcontent into autopkgtest-cloud:master

Proposed by Brian Murray
Status: Needs review
Proposed branch: autopkgtest-cloud:launchpadcontent
Merge into: autopkgtest-cloud:master
Diff against target: 12 lines (+1/-0)
1 file modified
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker (+1/-0)
Reviewer Review Type Date Requested Status
Paride Legovini (community) Needs Fixing
Ubuntu Release Team Pending
Review via email: mp+429174@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

I don't think this is very useful alone, as the script will continue adding PPAs using ppa.launchpad.net, see:

https://git.launchpad.net/autopkgtest-cloud/tree/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker?id=92bb0adb7a6d8c6237d7f7d5d1b792c2213f044c#n645

The ppa.launchpad.net URLs will continue to work indefinitely, see [1].

Switching to ppa.launchpadcontent.net is necessary if we want to switch to https, which is a nice improvement. We should change the code I linked above and then also update TEMPORARY_TEST_FAIL_STRINGS (this time using port 443), and drop ppa.launchpad.net:80.

[1] https://blog.launchpad.net/ppa/new-domain-names-for-ppas

review: Needs Fixing

Unmerged commits

5eddf32... by Brian Murray

add in ppa.launchpadcontent.net

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
2index 8a05766..a72cff8 100755
3--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
4+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
5@@ -87,6 +87,7 @@ FAIL_STRINGS = ['Kernel panic - not syncing:',
6 'Call Trace:']
7 TEMPORARY_TEST_FAIL_STRINGS = ['Could not connect to ftpmaster.internal:80',
8 'Cannot initiate the connection to ppa.launchpad.net:80',
9+ 'Cannot initiate the connection to ppa.launchpadcontent.net:80',
10 'Failed to fetch http://ftpmaster.internal/',
11 '" failed with stderr "error: Get https://0.0.0.0/1.0/operations/',
12 'RecursionError: maximum recursion depth exceeded in comparison', # #1908506

Subscribers

People subscribed via source and target branches