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.

Sign up for GitHub

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

Jump to bottom

DLPX-90177 resolve merge conflicts in cloud-init #81

Merged
merged 3 commits into from
Mar 8, 2024
Merged

DLPX-90177 resolve merge conflicts in cloud-init #81

merged 3 commits into from
Mar 8, 2024

Conversation

jwk404
Copy link
Contributor

@jwk404 jwk404 commented Mar 4, 2024

This change resolves a merge conflict with upstream. Two files were in conflict.

  • .github/workflows/cla.yml
    • Deleted by us, but modified upstream.
  • systemd/cloud-init-generator.tmpl
    • We had previously modified this file to cause cloud-init to be disabled when in an upgrade container. The call site was removed upstream, so this change had to be reworked to fit in with the current upstream code.

In addition, some test additions in tests/unittests/sources/test_azure.py were failing because they weren't conforming to previous changes we made to match on interface name rather than mac address.

Testing:
http://selfservice.jenkins.delphix.com/job/appliance-build-orchestrator-pre-push/8034/

Delphix Engineering added 2 commits February 24, 2024 04:17
Version: 23.4.3-0ubuntu0~20.04.1
6bb790b 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 3.0 (quilt)
Source: cloud-init
Binary: cloud-init
Architecture: all
Version: 23.4.3-0ubuntu0~20.04.1
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Homepage: https://cloud-init.io/
Standards-Version: 4.4.1
Vcs-Browser: https://github.com/canonical/cloud-init/tree/ubuntu/devel
Vcs-Git: https://github.com/canonical/cloud-init -b ubuntu/devel
Build-Depends: debhelper (>= 9.20160709), dh-python, iproute2, po-debconf, python3, python3-configobj, python3-debconf, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-netifaces, python3-oauthlib, python3-pytest, python3-pytest-mock, python3-requests, python3-serial, python3-setuptools, python3-yaml, python3-responses, python3-passlib
Package-List:
 cloud-init deb admin optional arch=all
Checksums-Sha1:
 aec710612bc1e34681e29f6fb4bf0f7aecc25587 1650027 cloud-init_23.4.3.orig.tar.gz
 cccc9989beaa1a39b52ee9ff1d42dd014f1e5d3b 93172 cloud-init_23.4.3-0ubuntu0~20.04.1.debian.tar.xz
Checksums-Sha256:
 c4c2fb7616669189ffba23bd88f75aed603158d1fa4786fd51c2d9ebed5464d7 1650027 cloud-init_23.4.3.orig.tar.gz
 3b8bf1362bdb17b1f61f7016b97d68546690b29733c4dfb98c9f636abc6d2aa8 93172 cloud-init_23.4.3-0ubuntu0~20.04.1.debian.tar.xz
Files:
 6290c5d889f97aa9f8ac289fa87dfee6 1650027 cloud-init_23.4.3.orig.tar.gz
 c67082f26bcb526f101556d0f5c7cca2 93172 cloud-init_23.4.3-0ubuntu0~20.04.1.debian.tar.xz
Python-Version: all

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE4lRR4CIbV3Pev/F47NrLFgmVrYkFAmXBUYUACgkQ7NrLFgmV
rYlWthAAlexP9NY4mdoR7Ta9PkM4PVIvBcj+Z4IOLWjgc4Rw+GdbX6ZzXuq62S8h
vbRsPpT1NfuD0S39M+9cDZVMyDHvwNfIbmSDRLyQA+utduW38jZMXZxU5jWUjp0P
+WYK1zNUxgSMKW7mTgWRsJpdv6TN/WV/632JCQ6h1MPHKLlVnd/5dIU0Kkl9UYfY
b3GQ0tUoweqUWVw1APbQLz9FCuH2WD04sgVockPVMPlhCjy5xzzE58pq5J6uqMhm
17zu7DO7MUs7y9NZLi6y/Bb4TuAbSOlk0SjZf2MvqsDi4C2Ef+CQUyt7H9GUCF5/
dxR2080/J9bFyqL4icQpsi3eeyeKSO5IgNHWfWR/Rm0uOCIPmVahZI3IxIwByJI3
8XT8EKdVJY1jKqm5CFAdcmUghtoJ5JjZhloVXL5ZhHNoHMoLu8QRlYeGO6gW0MvX
8nSNwYbhMQr9yr+XWtTUPEZSYWtemxmFCpC9EIpFT3ovVprfpcq/0eUjOmz1w4Vs
lHwLDaKBGxk91h7S/QTlhjcu5p3NAxrIdT5kgQ84Uj2sjUBe0b1nPOutUqiMJAgW
gXabeR8Kl+waQaheYs39bE5qGIPfN1ZqIf0jLmiZkZnjCIOHdV/WkL4J3B1f9sc+
oU9sNPduC5EDas90CUZhtOeMwtWH3OXrRbIXg/vERIa0FyLPP/g=
=97CI
-----END PGP SIGNATURE-----
Version: 23.4.4-0ubuntu0~20.04.1
ad10748 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 3.0 (quilt)
Source: cloud-init
Binary: cloud-init
Architecture: all
Version: 23.4.4-0ubuntu0~20.04.1
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Homepage: https://cloud-init.io/
Standards-Version: 4.4.1
Vcs-Browser: https://github.com/canonical/cloud-init/tree/ubuntu/devel
Vcs-Git: https://github.com/canonical/cloud-init -b ubuntu/devel
Build-Depends: debhelper (>= 9.20160709), dh-python, iproute2, po-debconf, python3, python3-configobj, python3-debconf, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-netifaces, python3-oauthlib, python3-pytest, python3-pytest-mock, python3-requests, python3-serial, python3-setuptools, python3-yaml, python3-responses, python3-passlib
Package-List:
 cloud-init deb admin optional arch=all
Checksums-Sha1:
 e9d2d65539568f9abc9b22666a84e228240ed11d 1760462 cloud-init_23.4.4.orig.tar.gz
 ef6993da1599626372c30e50c4f2dce95a44ca20 93196 cloud-init_23.4.4-0ubuntu0~20.04.1.debian.tar.xz
Checksums-Sha256:
 ffedd8c1c80c765e64ba99a49dd92150f2a51214bf16ee52c15f4dbf6522049b 1760462 cloud-init_23.4.4.orig.tar.gz
 d8984b489862b9afef31e7d23aa74aaa1bfc848ace3b613ffbd1f14d05e24eca 93196 cloud-init_23.4.4-0ubuntu0~20.04.1.debian.tar.xz
Files:
 8002d8faa3b71e20977df344ea714296 1760462 cloud-init_23.4.4.orig.tar.gz
 46b3d615c7a8383d21df368fb0d46f1a 93196 cloud-init_23.4.4-0ubuntu0~20.04.1.debian.tar.xz
Python-Version: all

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE4lRR4CIbV3Pev/F47NrLFgmVrYkFAmXeZN4ACgkQ7NrLFgmV
rYnKQA//Sf9l84646aXFsPmAj2NtbUQPZP7OgZprTfoLn9SHiLRvXYaMuRpSom1S
PKN/twrxc/PN48HQh0gVc7RESbWtxO5vZuuvHvF1gCe824vdjv1APTLjFguIxjYx
MDqtuKAK2fh1R/f1SuOBqsmb8zwFCjCNt9Eu3ZpajQbxZMkTvitMRGqwbyAB97qY
Ts0c6+gDNwD/3wmFDVvZquQEoZUWQFXyNpAVYuN6LTFT4x8g8NTD1Z06kLzO+7/7
lCrHkfCIMU7F2fCHByuUFsGaqabM5WhRxnbx79JM4E97qsoajAByWI7ifeEf/sA2
otNVk8A18rGPn7+36KTzGrJG3R/URqWSrzZdOd4JicT9xfp2u7WtHDVXs9XcE0Gs
QqaL51N8TKxRJMq/gs7mJU+Hp1xT3G+SVQFBXOOXmGKnp+0HmvV9oshX5NrdkW6F
j4t2/Z+d7kSj3rn75gGcAumlWJD+ckqA+RN594BuwIpL6Lw3RXpAjt9NVMTz9wnc
756PoYRzJMEvh2p8+29Pq9vlpl5h7TQGAFC4BlE/799SLVy3tk0bG6YKBJKEafiY
V7XF10HsmTBVK80BlIsWsZdHP6GpL286IDEvydWzCkD+YhPB9lVAQjznzHQ5u/H/
Qb8e22VoABjDgtICxQ6+hITgMattwg/CXtnQsPlZSfgD9BFXaTw=
=eVuf
-----END PGP SIGNATURE-----
pcd1193182
pcd1193182 approved these changes Mar 4, 2024
View reviewed changes
Copy link
Contributor

@pcd1193182 pcd1193182 left a comment

Choose a reason for hiding this comment

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

The code changes look reasonable to me, but something is breaking the checks. Can you investigate and see if that's a result of some of the changes being made?

@jwk404 jwk404 marked this pull request as draft March 4, 2024 22:38
@jwk404
Copy link
Contributor Author

jwk404 commented Mar 4, 2024

I intended to submit this as a draft, as ab-pre-push built cloud-init ok, but isn't completely finished yet. The required test failure is due to a missing jira for this. The rest seem unrelated, and lots of tests fail in the previous PR as well, but the logs are gone so it's not possible to compare. I'll investigate further.

@jwk404 jwk404 changed the title Merge DLPX-90177 resolve merge conflicts in cloud-init Mar 6, 2024
@jwk404
Copy link
Contributor Author

jwk404 commented Mar 6, 2024

The CI errors are unrelated to this conflict, and appear to be a long standing issue. The work to fix them seems non-trivial, so I filed DLPX-90179 for that. Re-running the tests now to get a clean run of the required jira checks.

@jwk404 jwk404 marked this pull request as ready for review March 6, 2024 23:54
@jwk404 jwk404 changed the title DLPX-90177 resolve merge conflicts in cloud-init DLPX-90177 resolve merge conflicts in cloud-init Mar 6, 2024
@jwk404 jwk404 changed the title DLPX-90177 resolve merge conflicts in cloud-init DLPX-90177 resolve merge conflicts in cloud-init Mar 6, 2024
@jwk404 jwk404 merged commit 41b9123 into delphix:develop Mar 8, 2024
13 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pcd1193182 pcd1193182 pcd1193182 approved these changes

@prakashsurya prakashsurya prakashsurya approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jwk404 @pcd1193182 @prakashsurya