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

Correctly report valid series for juju 2.9 #49

Merged
merged 2 commits into from
Apr 29, 2024

Conversation

Aflynn50
Copy link
Contributor

@Aflynn50 Aflynn50 commented Apr 26, 2024

In version 2.9 new ubuntu series that appear in the distro info are automatically marked as supported. This is because in this package, when they are read out, the default is Supported:true. This PR changes that to false. This method of determinng series is not used by any of the supported 3.x versions of Juju, only by Juju 2.9.

This PR updates the supported os series supported by juju. It keeps a list of known supported versions and if a version is not in the list it is not marked as supported when it is found in the os distro-info.

"noble": {
Version: "24.40",
LTS: true,
ESMSupported: true,
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Also at the time (this is 4+ years ago) I didn't have the courage to bring on the os/series package into Juju, which would have made this so much easier to work out. Today we should 100% just bring in the os package into Juju (it's on my very long list).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah yea, good point, I've changed that to false, that matches the others in there.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea it defo should be brought in, I can imagine we're not even using most of it, like all this reading distroinfo stuff will not be needed at all.

Copy link
Member

@anvial anvial left a comment

Choose a reason for hiding this comment

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

Discussed all the details in chat. Thx for changes.

@Aflynn50 Aflynn50 merged commit c95d1bd into juju:master Apr 29, 2024
2 of 4 checks passed
@Aflynn50 Aflynn50 mentioned this pull request Apr 29, 2024
1 task
jujubot added a commit to juju/juju that referenced this pull request Apr 29, 2024
#17283

<!-- Why this change is needed and what it does. -->
Terraform tests require a new variable to indicate the version of juju that they are operating with. This is added to the actions yaml.

This PR also brings in the fix from juju/os#49 which stops juju 2.9 supporting new distro versions it finds in distro info. The tests are updated to account for `noble`.
## Checklist

<!-- If an item is not applicable, use `~strikethrough~`. -->

- [x] Code style: imports ordered, good names, simple structure, etc

## QA steps

CI passes
Supported: false,
},
"noble": {
Version: "24.40",
Copy link
Member

@jack-w-shaw jack-w-shaw May 15, 2024

Choose a reason for hiding this comment

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

🤯🤯🤯🤯🤯🤯

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.

4 participants