Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure the security archive is set to the proper URL #1790

Merged
merged 3 commits into from
Sep 8, 2023

Conversation

ogayot
Copy link
Member

@ogayot ogayot commented Sep 7, 2023

A regression was introduced as part of mirror testing.

On new Ubuntu installations, the -security pocket is accessed through the primary mirror instead of being accessed through security.ubuntu.com/ubuntu (or ports.ubuntu.com/ubuntu-ports)

This happens because when no security section is provided to curtin, the value configured in the primary section is reused.

We now ensure that the right URI is used for the security repository.

It has a slight impact on the behavior of mirror testing though. Instead of downloading content from the primary repository only, we would download content from the primary+security repository. Therefore, we would try all the candidate mirrors without success is the security repository is unreachable. To work around this issue, we now disable the -security suite when running mirror testing. This requires a fix in curtin for releases that use deb822 sources: https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/450893

Copy link
Collaborator

@dbungert dbungert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functionally this sounds fine but I really want test automation here, to attempt to avoid a repeat. Integration tests can examine var/log/installer/subiquity-curtin-apt.conf. Let's think about the unit test angle as well. I appreciate it.

Mirror testing should focus on testing the primary mirror, not the
security archive - therefore we disable the -security suite.

Signed-off-by: Olivier Gayot <[email protected]>
When the URL of the security archive is unset, curtin will set it to the
URL of the primary archive.

This is not the behavior we want for Ubuntu installations. On amd64 (and
i386), the URL of the security archive should be set to
http://security.ubuntu.com/ubuntu

On other architectures, it should be set to
http://ports.ubuntu.com/ubuntu-ports

Signed-off-by: Olivier Gayot <[email protected]>
Copy link
Collaborator

@dbungert dbungert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good for merge when the curtin part is ready.

@dbungert dbungert merged commit f7c5d8c into canonical:main Sep 8, 2023
11 checks passed
@ogayot ogayot deleted the security-archive branch September 11, 2023 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants