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

Ubuntu/focal: refresh patches to fix daily build recipe #5736

Merged
merged 22 commits into from
Sep 24, 2024

Conversation

blackboxsw
Copy link
Collaborator

@blackboxsw blackboxsw commented Sep 24, 2024

Proposed Commit Message

Use individ commits

Additional Context

daily recipe failure https://launchpadlibrarian.net/751040004/buildlog.txt.gz

Test Steps

git fetch upstream 
git checkout upstream/main -B main
git merge ubuntu/focal
quilt push -a; tox -e py3; quilt pop -a

Merge type

  • git push from command line
  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

holmanb and others added 22 commits September 18, 2024 09:32
Force inline sftp closure rather than on garbage collection.
Without this, pytest causes tracebacks because it cleans up the logger
before the final sftp connection is closed, which causes tracebacks
after tests exit.
Also:
- simplify checkout logic to use local github main branch
- add human-friendly job name and reduce redundant words
)

Also refactor and pytestify tests dropping use of
FilesystemMockingTestCase.
Add Cloud-Init support for instances running in CloudCIX.
IMDS configuration data is served on a link-local IP address at
http://169.254.169.254/v1 providing user-data, meta-data and
network-config.

For more information about the platform, see
https://www.cloudcix.com/
In 62ace19 we moved cloud-init-hotplugd.socket earlier in boot,
after cloud-config.target. But we didn't remove the dependencies added
by default and this might conflict with other units producing
non-solvable ordering cycles, see #2081124.

Remove the default dependency on sysinit.target added by systemd.

LP: #2081124
…#5719)

Since Noble is an LTS which supports Ubuntu Pro add integration
test coverage for that feature.

Bump pycloudlib dependency to 1!9.2 which allows cloud-init
integration tests to obtain service_account_email configuration from
the .config/pycloudlib.toml:

[gce]
credentials_path = <path>

without the need to also provide `service_account_email` in
pycloudlib.toml.
Used fallback datasource is no longer a warning when configured as
datasource_list: [ None ] due to commit 28d66ef

Drop unnecessary WARNING checks because verify_clean_boot handles
warning checks.
This test has some questionable history that has been removed. The
main purpose of the test is to ensure that we get a log that the
python-version file is written if there's no pre-existing
python-version file but there is pre-existing pickle cache.

The invalid pickle at the beginning of the test complicated this test.
A normal boot will write a valid cache, so we should get no pickle
errors on reboot.
The logic in Timed() has defaults which are designed to avoid low-value log
messages. A log is only emitted when the threshold is exceeded. Additionally,
the log_mode parameter allows the caller to prevent Timed() logs, so that the
caller may coalesce the message into another log.

- Make timer helper into a context manager.
- Add new decorator for timing functions.
- Simplify timer helper function, eliminate obsolete logic.
- Eliminate redundant logs and timer calls.
refactors existing code to utilize timer codepaths:

- replace manual timer implementations in subp.py and sockets.py
- replace open() / read() calls with util.load_text_file() where appropriate
Remove those modules from the override list.
patches:
- d/p/revert-551f560d-cloud-config-after-snap-seeding.patch
@github-actions github-actions bot added the packaging Supplemental package review requested label Sep 24, 2024
@blackboxsw blackboxsw merged commit 9470db4 into canonical:ubuntu/focal Sep 24, 2024
19 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packaging Supplemental package review requested
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants