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

feat(azurelinux): Add new distro 'azurelinux' for Microsoft Azure Linux. #4931

Merged
merged 2 commits into from
Mar 13, 2024

Conversation

ddstreetmicrosoft
Copy link
Contributor

@ddstreetmicrosoft ddstreetmicrosoft commented Feb 21, 2024

Proposed Commit Message

This adds support for the new (renamed) distro 'Azure Linux'.                                                                                                                                 
                                                                                                                                                                                              
Azure Linux is the renamed next version of the existing 'Mariner'                                                                                                                             
distro. It is similar to the 'Mariner' distro but changes the base                                                                                                                            
inherited Distro() class.                                                                                                                                                                     

Additional Context

Checklist

Merge type

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

@ddstreetmicrosoft
Copy link
Contributor Author

CC @rmhsawyer @christopherco

@@ -25,6 +25,7 @@
distros = [
"almalinux",
"alpine",
"azure",

Choose a reason for hiding this comment

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

azurelinux

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks! fixed

# For example: if you request to install foo, bar and baz and baz
# is installed; yum won't error out complaining that baz is already
# installed.
cmd = ["yum", "-t"]

Choose a reason for hiding this comment

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

Consider deprecating yum. Default to tdnf

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yum is only being used as a final fallback here, after attempting dnf and tdnf first...we could switch the final fallback over to tdnf instead (and drop falling back to yum completely) if that's what you mean?

Choose a reason for hiding this comment

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

Yes, that is what I meant. I was thinking we should switch the final fallback to tdnf and drop yum, since yum for us is really a symlink to tdnf, and we ought to remove this in our upcoming major release - https://github.com/microsoft/CBL-Mariner/blob/3.0-dev/SPECS/tdnf/tdnf.spec#L147

Choose a reason for hiding this comment

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

ack, updated, thanks!

Copy link

@christopherco christopherco left a comment

Choose a reason for hiding this comment

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

lgtm

@ddstreet
Copy link

ddstreet commented Mar 1, 2024

rebased

@ddstreet
Copy link

ddstreet commented Mar 1, 2024

updated config/cloud.cfg.tmpl in some locations I missed before

@TheRealFalcon TheRealFalcon self-assigned this Mar 1, 2024
@TheRealFalcon
Copy link
Member

@ddstreetmicrosoft Thanks for this PR. Does this mean that the Mariner datasource is no longer relevant? Should we remove it at some point?

If you check the CI runs, you'll see there's a few lint failures that need to be fixed before we can merge this.

Additionally, before we can accept your change, you need to sign the CLA and add your Github username (alphabetically) to the cla signers file . The full details are described in the last bullet point of the documentation . It looks like you may have already signed the CLA under a different github name, so if you're using two (ddstreet and ddstreetmicrosoft), please add them both the signers file.

@cjp256
Copy link
Contributor

cjp256 commented Mar 7, 2024

LGTM. Looks like black needs to be run against some of the files. Is there need to keep Mariner after this change?

@ddstreet
Copy link

ddstreet commented Mar 8, 2024

@ddstreetmicrosoft Thanks for this PR. Does this mean that the Mariner datasource is no longer relevant? Should we remove it at some point?

LGTM. Looks like black needs to be run against some of the files. Is there need to keep Mariner after this change?

While the Mariner naming is currently still a supported release, that name will retire at the end of its support lifetime; I could update this PR to completely switch over (i.e. remove 'Mariner' while adding 'Azure Linux') if you think that's appropriate? Since the Mariner release is in a stable period (and shouldn't be updating its cloud-init) there shouldn't be any reason to need to keep it in the upstream code here.

Alternately, I could open a separate PR to remove 'Mariner', either soon or closer to when it goes EOL (which will be late this year at the earliest, more likely sometime next year).

If you check the CI runs, you'll see there's a few lint failures that need to be fixed before we can merge this.

ack, thanks, i ran tox -e do_format and added the change, and a full tox run succeeded, so should be ok now i hope.

Additionally, before we can accept your change, you need to sign the CLA and add your Github username (alphabetically) to the cla signers file . The full details are described in the last bullet point of the documentation . It looks like you may have already signed the CLA under a different github name, so if you're using two (ddstreet and ddstreetmicrosoft), please add them both the signers file.

i signed the CLA and included both my github usernames (ddstreet and ddstreetmicrosoft) in the signers file, in this pr.

@TheRealFalcon
Copy link
Member

Alternately, I could open a separate PR to remove 'Mariner', either soon or closer to when it goes EOL (which will be late this year at the earliest, more likely sometime next year).

Yes, a separate PR sounds good. If there is truly no need for the upstream code anymore, then soon is fine, but there is also no harm in keeping it here for the time being.

@TheRealFalcon
Copy link
Member

TheRealFalcon commented Mar 13, 2024

The 3.13 test failure is unrelated and being addressed in #5052 . If everything else passes I'll merge as-is.

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! Thanks @ddstreet

@TheRealFalcon TheRealFalcon merged commit 9c001cf into canonical:main Mar 13, 2024
28 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants