Skip to content

test: drop unused MODEL_SETTINGS from tox environments and example charms - #2702

Open
sundeep8967 wants to merge 1 commit into
canonical:mainfrom
sundeep8967:fix/drop-model-settings-from-example-charms
Open

test: drop unused MODEL_SETTINGS from tox environments and example charms#2702
sundeep8967 wants to merge 1 commit into
canonical:mainfrom
sundeep8967:fix/drop-model-settings-from-example-charms

Conversation

@sundeep8967

@sundeep8967 sundeep8967 commented Aug 25, 2026

Copy link
Copy Markdown

In tox.ini for the root workspace and example charms, MODEL_SETTINGS was listed under passenv / pass_env. This variable is not read by Jubilant or documented as a standard harness option, leaving an unused legacy placeholder across example charms.

  • Removed MODEL_SETTINGS from passenv in root tox.ini.
  • Removed MODEL_SETTINGS from pass_env across all 7 example charms (httpbin-demo, k8s-1-minimal, k8s-2-configurable, k8s-3-postgresql, k8s-4-action, k8s-5-observe, and machine-tinyproxy).

Refs #2652 - note that the charmcraft PR still needs to be done too.

Remove the unused MODEL_SETTINGS variable from passenv in root tox.ini
and example charm tox configurations. MODEL_SETTINGS is not read by
Jubilant or documented as a standard harness option, and was legacy
placeholder configuration.

Fixes canonicalGH-2652

Signed-off-by: sundeep8967 <sundeep8967@gmail.com>
@tonyandrewmeyer tonyandrewmeyer changed the title tox: drop unused MODEL_SETTINGS from tox environments and example charms chore: drop unused MODEL_SETTINGS from tox environments and example charms Aug 26, 2026

@tonyandrewmeyer tonyandrewmeyer left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thanks for contributing this. Seems fine to me. The odd passenv/pass_env difference will be handling when we move to Make. I've cleaned up the PR title and description - please try to match our style in any future contributions.

@dwilding dwilding left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Approved - thanks @sundeep8967!

But I would rather wait for the Charmcraft profiles update before merging this, otherwise our example charms will be (very slightly) out of sync with what our K8s tutorial produces.

@tonyandrewmeyer I will open a Charmcraft PR today to try to catch the next release along with our other pending profile changes.

@dwilding

Copy link
Copy Markdown
Contributor

Charmcraft PR: canonical/charmcraft#2852

@sundeep8967 sundeep8967 changed the title chore: drop unused MODEL_SETTINGS from tox environments and example charms test: drop unused MODEL_SETTINGS from tox environments and example charms Aug 27, 2026
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.

3 participants