Skip to content

ci: don't merge, only testing CI #1266

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

Closed
dimaqq wants to merge 3 commits into from
Closed

ci: don't merge, only testing CI #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b6ff34
ci: don't merge, only testing CI
dimaqq May 21, 2025
2923733
ci: force 22.04 base for integration tests
dimaqq May 21, 2025
2b64f71
ci: force 22.04 base for integration tests
dimaqq May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CONTRIBUTORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ Simon Richardson
Jack Shaw
Leon Mintz
Adam Dyess
---
Dummy change, don't merge
6 changes: 6 additions & 0 deletions tests/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ async def __aenter__(self):
model_name = f"test-{test_run_nonce}-{test_name}-{model_nonce}"
self._model = await self._controller.add_model(model_name)

# Some charms used for testing are not yet available for 24.04
await self._model.set_config({
"default-base": "ubuntu@22.04",
# "default-series": "jammy", # not allowed to set both
})

# Change the JujuData instance so that it will return the new
# model as the current model name, so that we'll connect
# to it by default.
Expand Down
Loading