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

fix daily recipe ubuntu/noble new_upstream_snaphot to refresh quilt patches #5694

Merged
merged 23 commits into from
Sep 12, 2024

Conversation

blackboxsw
Copy link
Collaborator

Perform new_upstream_snapshot,py to sync unreleased tip of main into ubuntu/noble in order to fix daily recipe builds which are failing due to commit 9cc458c drift in systemd files which no-singleprocess.patch removes.

Proposed Commit Message

-- see top three most recent separate commits

Additional Context

failed build recipe logs
the error:


patching file systemd/cloud-init-main.service.tmpl
Hunk #1 FAILED at 1.
Not deleting file systemd/cloud-init-main.service.tmpl as content differs from patch

steps to create this branch

new_upstream_snapshot.py # expect failure
quilt push -a
quilt push -f
rm systemd/cloud-init-main.service.tmpl
quilt refresh
quilt pop -a 
git commit -am 'refresh patches....'
new_upstream_snapshot.py -p quilt
# enter no SRU bug to leave UNRELEASED state
# manually add refreshed patches to d/changelog

Test Steps

git checkout main
git pull
git reset --hard upstream/main
git merge ubuntu/noble
quilt push -a
tox -e py3
quilt pop -a

Merge type

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

blackboxsw and others added 22 commits August 30, 2024 15:19
Bump the version in cloudinit/version.py to 24.3 and
update ChangeLog.
…nical#5640)

If an instance in _routed-ip_ mode uses both IPv4 **and** IPv6, but
the IPv6 is listed (attached) first, the default IPv6 route may be
absent from the final network configuration for systems that do not
accept Router Advertisements.

This change fixes the problem by making sure that routes are
appended, not overwritten.
- Update upstream cloud-init config template for azurelinux distro
- remove modules that not currently supported azurelinux

Co-authored-by: minghe <rmhsawyer>
…mpl (canonical#5653)

Fixes lintian warning systemd-service-file-shutdown-problems. See [1,
2].

Remove superflous conditional additions of Conflicts=shutdown.target as
it is unconditionally added for every target.

[1] https://salsa.debian.org/lintian/lintian/-/blob/2.118.0/tags/s/systemd-service-file-shutdown-problems.tag
[2] systemd/systemd#11821
Bump the version in cloudinit/version.py to 24.3.1 and
update ChangeLog.
Setting TZ environment variable was introduced as a performance
optimization in 2016[1]. However, this optimization never worked,
because it introduced code which only runs when __name__ is "__main__".
This never happens when installed via setuptools - it gets imported
and executed by the "cloud-init" script.

The underlying issue was fixed at some point between Trusty and Bionic,
presumably in cPython or in glibc. The following reproducer of the
original issue will print multiple lines on an affected system.

strace /usr/bin/python3 -c 'import os; from datetime import datetime; print([datetime.now() for i in range(10)])' |& grep -e localt -e zonei

[1] https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/307722
- use canonical/lxd action in integration test
- optimize integration test to run faster and use less resources
Make cloud-init usable without pyserial for DataSources that do not use
it.

Move pyserial optional dependency to requirements-all.txt.
This has the effect of: setup.py / dh_python will not consider them as
required dependencies and serves as upstream documentation.

Install requirements-all.txt in tox.

Fixes SC-5637
US120
Initialization of IMDS is periodically exceeding the 120s limit on
instance launch. Increase the timeout to allow for this variance.
    
Update docs to reflect change.
$INSTANCE_ID is an environment variable that contains a reference
to the current instance id. Its use is no longer needed now that
we can use jinja templates with {{ v1.instance_id }}. Furthermore,
`cloud-init-per` is a better replacement for running scripts once
per instance.

In particular, this commit does the following:
- Add jinja templating functionality to boothooks to be consistent
  with other core user data types
- Document cloud-id and cloud-init-per as they were previously
  undocumented
- Replace all $INSTANCE_ID references in docs to either use
  {{ v1.instance_id }} or the `cloud-init-per` script
- Update documentation of $INSTANCE_ID to now be deprecated
- Update tests as necessary
Also verify that cloud-init status has a valid return code.
patches:
- d/p/no-single-process.patch
@holmanb
Copy link
Member

holmanb commented Sep 11, 2024

@blackboxsw it looks like this has a rebase conflict

@blackboxsw
Copy link
Collaborator Author

@blackboxsw it looks like this has a rebase conflict

shouldn't that rebase conflict be resolved via 26ed394?

Copy link
Member

@TheRealFalcon TheRealFalcon left a comment

Choose a reason for hiding this comment

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

LGTM! @holmanb , what do you mean by rebase conflict?

@TheRealFalcon
Copy link
Member

Actually...should the changelog include the patch update?

@blackboxsw blackboxsw added the packaging Supplemental package review requested label Sep 12, 2024
@holmanb
Copy link
Member

holmanb commented Sep 12, 2024

LGTM! @holmanb , what do you mean by rebase conflict?

Screenshot from 2024-09-12 09-38-35

Copy link
Member

@TheRealFalcon TheRealFalcon left a comment

Choose a reason for hiding this comment

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

LGTM! I don't see the rebase conflict, so I think whatever was there is gone now?

@holmanb
Copy link
Member

holmanb commented Sep 12, 2024

LGTM! I don't see the rebase conflict, so I think whatever was there is gone now?

+1 No problem on merging, I'm guessing the UI is just buggy since I haven't seen this before.

@blackboxsw blackboxsw merged commit b0542a4 into canonical:ubuntu/noble Sep 12, 2024
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.

7 participants