Merge autopkgtest-cloud:updates-sources into autopkgtest-cloud:master

Proposed by Brian Murray
Status: Rejected
Rejected by: Brian Murray
Proposed branch: autopkgtest-cloud:updates-sources
Merge into: autopkgtest-cloud:master
Diff against target: 13 lines (+1/-1)
1 file modified
mojo/service-bundle (+1/-1)
Reviewer Review Type Date Requested Status
Brian Murray Disapprove
Review via email: mp+462527@code.launchpad.net

Description of the change

With the newly created armhf noble images I was seeing the following error:

77s sed: can't read /etc/apt/sources.list: No such file or directory

To get things working again I just cowboy'ed out the sed part of the setup command in the worker-lxd-armhf.conf file on the autopkgtest-lxd-worker unit. However, we should modify the apt sources to use the fastest mirror available which is presumably ftpmaster. The merge proposal here does just that and while I've tested it locally it has not been tested in production (or staging) and should be.

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

Bleh, this only work on Noble whereas we need the current sed line for previous releases.

review: Needs Fixing
Revision history for this message
Tim Andersson (andersson123) wrote :

This doesn't happen with the 5.20 branch right? We should discuss this in standup today

Revision history for this message
Brian Murray (brian-murray) wrote :

Well it is needed with 5.20 or 5.32 depending on if the images are built with deb822 sources but the only release affected is noble. I do wonder if there is a backwards compatible way to create a sources.list entry that would work for all releases.

Revision history for this message
Brian Murray (brian-murray) wrote :

We actually dropped the sed portion of this as we have set the mirror to ftpmaster during the daily build so this change is obsolete.

review: Disapprove

Unmerged commits

3c2f58d... by Brian Murray

mojo: update how apt sources are modified

Succeeded
[SUCCEEDED] pre_commit:0 (build)
[SUCCEEDED] unit_tests:0 (build)
[SUCCEEDED] build_charms:0 (build)
13 of 3 results

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/mojo/service-bundle b/mojo/service-bundle
2index 934a4e3..24de83b 100644
3--- a/mojo/service-bundle
4+++ b/mojo/service-bundle
5@@ -140,7 +140,7 @@ applications:
6 <<: *common-options
7 worker-args: lxd -r $LXD_REMOTE $LXD_REMOTE:autopkgtest/ubuntu/$RELEASE/$ARCHITECTURE
8 {%- if stage_name == "production" or stage_name == "staging" %}
9- worker-setup-command2: sed -i "s/ports.ubuntu.com/ftpmaster.internal/; s/ubuntu-ports/ubuntu/" /etc/apt/sources.list `ls /etc/apt/sources.list.d/*.list 2>/dev/null || true`; ln -s /dev/null /etc/systemd/system/bluetooth.service; printf "http_proxy={{ http_proxy }}\nhttps_proxy={{ https_proxy }}\nno_proxy={{ no_proxy }}\n" >> /etc/environment
10+ worker-setup-command2: sed -i "s/ports.ubuntu.com/ftpmaster.internal/; s/ubuntu-ports/ubuntu/" /etc/apt/sources.list.d/ubuntu.sources `ls /etc/apt/sources.list.d/*.list 2>/dev/null || true`; ln -s /dev/null /etc/systemd/system/bluetooth.service; printf "http_proxy={{ http_proxy }}\nhttps_proxy={{ https_proxy }}\nno_proxy={{ no_proxy }}\n" >> /etc/environment
11 {%- endif %}
12 {%- if stage_name == "production" %}
13 lxd-remotes: |-

Subscribers

People subscribed via source and target branches