Ubuntu/devel #5896
Merged
Ubuntu/devel #5896
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use the dedicated volatile key instead.
This key is not documented by lxd and will likely be removed. Prefer "cloud-init." prefixes. Explain custom keys in instance-data. Add note about instance-data key aliases. Simplify instance-data explanations. Add more cross-references to the docs.
github.sha does not always points to the last commit in the
source branch of a PR, leading to errors like the following one while
performing:
$ git merge ${{ github.sha }}
merge: d8432ed - not something we can merge
Use github.event.pull_request.head.sha instead.
See [1, 2] for more context:
- [1] https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
- [2] https://github.com/orgs/community/discussions/26325
Add CLOUD_INIT_PKG to control what specific cloud-init package to install when CLOUD_INIT_SOURCE is PROPOSED, UPGRADE or points to a ppa. SC-1858
…nical#5754) GH checks should now pass when run out of a pr event (as the post merge event) while still work on prs and Jenkins.
Install and start are no longer separate operations, so update accordingly. Fixes canonicalGH-5746
Bring back log messages about link-local being used during ephemeral net setup at init-local time to make it testable.
Increase timeout check in netcat command for test_multi_nic_hotplug, as there are instances where the 5s timeout is not enough.
No functional test, just noop simplification of the test code.
…l#5682) Allow setting CLOUD_INIT_OS_IMAGE_TYPE="mimimal" to support running the full integration test suite against Ubuntu minimal images. Required for SC-1750: Daily jenkins ubuntu minimal test runner for Ubuntu Focal, Jammy and Noble releases.
canonical#5774) The src code directory for checking code coverage in was erroneously set to "cloud-init" instead of "cloudinit". This prevented unit test coverage from being gathered and reported.
When the pytest fails, its easier to debug if pytest is run in verbose mode. Enable it. Signed-off-by: Ani Sinha <anisinha@redhat.com>
days-before-{stale,close} seems to activate auto staleing of issues.
Demote them to days-before-pr{stale,close} to only act upon PRs.
Rereferences:
- [1] https://github.com/actions/stale
- [2] https://github.com/actions/stale/blob/main/action.yml
…l#5751) Previously, user data that was base64-encoded was decoded as a string, causing non-string data (e.g., gzipped user data) to raise an exception. This change ensures that the output of b64decode is not decoded to a string, passing along the decoded bytes unchanged.
…5777) Most RHEL systems use Network manager to bring up manage network connections. Network manager does not recognize "METRIC" option for network connections. It uses IPV4_ROUTE_METRIC and IPV6_ROUTE_METRIC options. Please see https://people.freedesktop.org/~lkundrak/nm-docs/nm-settings-ifcfg-rh.html This change ensures that cloud-init generates ifcfg network connection files with IPV{4/6}_ROUTE_METRIC options that are compatible with RHEL and network manager. Fixes canonicalGH-5776 Signed-off-by: Ani Sinha <anisinha@redhat.com>
…nical#5783) SDK changes surface instance_id as integer rather than as str. pycloudlib fixes provide a str value from instance.id. Convert it appropiately and adopt pycloudlib's public API, rather than directly accessing instance_id on the GCE SDK underliying instance object.
Avoid deprecating command line calls to cloud-init boot stages. When cloud-init's boot stages are invoked directly on the command line it is typically an attempt to add supplemental configuration to a system after initial boot has completed. Although direct calls to cloud-init boot stages could lead to misconfiguration if boot stages are called out of sequence or customized /etc/cloud/cloud.cfg alters which config modules are run during the boot stage, the support of such uses or custom environments is out of scope for this feature. It remains a simple tool to apply additional configuration via user-data onto an existing system after initial boot. At some point in the future, a new sub-command may be provided by cloud-init tooling to allow for supplemental configuration of user-data post-boot, in that event this --file feature will become deprecated in favor of a cleaner/simpler alternative. Fixes canonicalGH-5726
Commit 99f4ca4 bumped the max version of pycloudlib without bumping the min version.
It was removed in ed8f1b1 . Fixes canonicalGH-5786
…nonical#5793) Minimal images do not have rsyslog installed. As a result, no /var/log/syslog exists. Add helper function get_syslog_or_console to allow minimal images to use pycloudlib.Instance.get_console instead of reading /var/log/syslog.
Along with a drive-by CURRENT_RELEASE.series fix
…al#5885) Refactors the code in the file "tests/unittests/config/test_cc_timezone.py" using pytest. This helps remove dependance of this test on "tests/unittests/helpers.py:FileSystemMockingTestCase" Fixes: part of canonicalGH-5760
It has been broken and has marginal value, so it is not worth maintaining. Since it was a developer-facing option, this should have no backwards compatibility concerns. Fixes canonicalGH-5756
grub_dpkg was removed so that's one less event we should see
…onnectivity_to_imds()
Most RHEL systems use network manager to bring up manage network connections. Network Manager uses route-metric for the default route and route/plen[,gateway,metric] for the additional static routes, please see https://networkmanager.dev/docs/api/latest/nm-settings-nmcli.html https://networkmanager.dev/docs/api/latest/nm-settings-keyfile.html This changes ensures that cloud-init generates nmconnection files with route metric settings that are compatible with RHEL and network manager. Fixes: canonicalGH-5877 Signed-off-by: Amy Chen <xiachen@redhat.com>
Minimal Ubuntu images don't show full path
Tried to fix in aedb7f9 , but there are two events (start and stop) per module
Bump the version in cloudinit/version.py to 24.4 and update ChangeLog.
holmanb
reviewed
Nov 25, 2024
There was a problem hiding this comment.
This is the diff I see locally:
diff --git a/debian/NEWS b/debian/NEWS
index 93426a693..b57b8129c 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-cloud-init (24.4-0ubuntu1) plucky; urgency=medium
+cloud-init (24.4~4gc9dce94d-0ubuntu1) UNRELEASED; urgency=medium
Cloud-init added cloud-specific metapackages to better express
cloud-specific dependencies and reduce image size.
diff --git a/debian/changelog b/debian/changelog
index 47de1ef3a..3bc35bed2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,12 +22,12 @@ cloud-init (24.4-0ubuntu1) plucky; urgency=medium
* d/po/templates.pot and cloud-init.templates: enable CloudCIX by default.
* d/cloud-init-base.{config,postinst}:
+ Drop noop clean-up of cloud-init/* debconf values
- * Upstream snapshot based on upstream/main at c9b9eef3.
+ * Upstream snapshot based on 24.4.
List of changes from upstream can be found at
https://raw.githubusercontent.com/canonical/cloud-init/24.4/ChangeLog
- Bugs fixed in this snapshot: (LP: #1992853)
- -- James Falcon <james.falcon@canonical.com> Mon, 25 Nov 2024 10:42:33 -0600
+ -- Brett Holman <brett.holman@canonical.com> Mon, 25 Nov 2024 10:23:23 -0700
cloud-init (24.4~3+really24.3.1-0ubuntu4) oracular; urgency=medium
It shouldn't really matter, since the tag and the hash are the same, but I think we prefer the tag in the changelog.
holmanb
reviewed
Nov 25, 2024
| @@ -1,4 +1,4 @@ | |||
| cloud-init (24.4~4gc9dce94d-0ubuntu1) UNRELEASED; urgency=medium | |||
| cloud-init (24.4-0ubuntu1) plucky; urgency=medium | |||
There was a problem hiding this comment.
Double checking the version:
$ dpkg --compare-versions '24.4-0ubuntu1' gt '24.4~3+really24.3.1-0ubuntu4'
$ echo $?
0
looks good
TheRealFalcon
force-pushed
the
ubuntu/devel
branch
from
da05ec9 to
a81f577
Compare
|
Updated to use 24.4 in the changelog. |
holmanb
approved these changes
Nov 25, 2024
TheRealFalcon
force-pushed
the
ubuntu/devel
branch
from
a81f577 to
3d96f6d
Compare
holmanb
approved these changes
Nov 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Last 4 commits are the relevant ones. Updated NEWS file with version accordingly, ran
new_upstream_snapshot.py, updated d/changelog accordingly.