DLPX-92326 Fix merge conflict after upgrading cloud-init for LTS upgrade

[palash-gandhi]

The upstreams/os-upgrade branch of this repo now contains changes from cloud-init's version on Ubuntu 24.04. When updating the os-upgrade branch via an update-package job, I discovered the following merge conflict.

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/cla.yml
	both modified:   cloudinit/net/__init__.py

(run3) [Tue Oct 08, 12:13:57] ~/git/cloud-init (os-upgrade)

The conflicts arose from just 1 Delphix commit - #21 which was retained. See this

Extras:

• I also had to undo TOOL-17693 cloud-init's DHCP unit tests need root #62 due to failing unit tests. - commit
• I had to skip 2 failing unit tests due to an upstream bug that I just filed and was immediately fixed but we will have to wait for a new cloud-init release: Unit test failures in TestNetplanValidateNetworkSchema canonical/cloud-init#5804 - commit

build-package job: https://ops-jenkins.eng-tools-prd.aws.delphixcloud.com/job/linux-pkg/job/os-upgrade/job/build-package/job/cloud-init/job/pre-push/9/console

Here's the diff between this PR branch and upstreams/os-upgrade: upstreams/os-upgrade...dlpx/pr/palash-gandhi/f6a4ac32-d666-4715-a0f7-a58c83670281

Here's the merge conflict:

index 3a38380,28ac814..0000000
--- a/cloudinit/net/__init__.py
+++ b/cloudinit/net/__init__.py
@@@ -565,13 -563,17 +563,27 @@@ def generate_fallback_config(config_dri
          # can't read any interfaces addresses (or there are none); give up
          return None

++<<<<<<< HEAD
 +    #
 +    # Always match on the name, rather than the MAC address. This way,
 +    # if the MAC address changes (which is possible VM environments),
 +    # the network configuration will still apply.
 +    #
 +    match = {"name": target_name}
 +
++=======
+     # netfail cannot use mac for matching, they have duplicate macs
+     if is_netfail_master(target_name):
+         match = {"name": target_name}
+     else:
+         match = {
+             "macaddress": read_sys_net_safe(target_name, "address").lower()
+         }
+     if config_driver:
+         driver = device_driver(target_name)
+         if driver:
+             match["driver"] = driver
++>>>>>>> upstreams/os-upgrade
      cfg = {
          "dhcp4": True,
          "dhcp6": True,
* Unmerged path .github/workflows/cla.yml
(run3) [Tue Oct 08, 12:14:00] ~/git/cloud-init (os-upgrade)```