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

ci: re-enable integration tests with mysql-*operator #1013

Merged
merged 14 commits into from
Sep 27, 2023

Conversation

tonyandrewmeyer
Copy link
Contributor

@tonyandrewmeyer tonyandrewmeyer commented Sep 25, 2023

  • Only try to edit requirements.txt if it exists
  • If requirements.txt does not exist, then assume that the requirement is in pyproject.toml and edit that instead
  • Enable the integration tests with mysql-operator and mysql-k8s-operator again
  • Remove the static-charm tox runs from the DB workflow, as none of the DB operators have one defined
  • Pin tox to anything compatible with 4.2

Note that bash/sed is not a personal strength, so there could well be a nicer way to do this.

Fixes #987.

@tonyandrewmeyer tonyandrewmeyer added the bug Something isn't working label Sep 25, 2023
@tonyandrewmeyer tonyandrewmeyer changed the title ci: adjust pyproject.toml if it exists and requirements.txt does not ci: re-enable integration tests with mysql-operator and mysql-k8s-operator Sep 25, 2023
@tonyandrewmeyer tonyandrewmeyer marked this pull request as ready for review September 26, 2023 04:31
Copy link
Collaborator

@benhoyt benhoyt left a comment

Choose a reason for hiding this comment

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

Looks good to me -- one question, and one minor tweak requested on the poetry version.

.github/workflows/db-charm-tests.yaml Outdated Show resolved Hide resolved
.github/workflows/db-charm-tests.yaml Show resolved Hide resolved
.github/workflows/db-charm-tests.yaml Show resolved Hide resolved
@benhoyt benhoyt changed the title ci: re-enable integration tests with mysql-operator and mysql-k8s-operator ci: re-enable integration tests with mysql-*operator Sep 26, 2023
* Pin all tox's to anything compatible with 4.2
* Pin poetry to anything compatible with 1.6
* Remove the 'static-charm' tox run from the DB workflow, as none of the repositories have that target, and more recent versions of tox will fail if the target (env) doesn't exist.
@benhoyt benhoyt merged commit 7e5e2e8 into canonical:main Sep 27, 2023
20 checks passed
@benhoyt
Copy link
Collaborator

benhoyt commented Sep 27, 2023

Thanks! CI improvements, merging without further review.

@tonyandrewmeyer tonyandrewmeyer deleted the fix-ci-poetry-987 branch September 27, 2023 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix mysql-operator charm test now that it uses Poetry for deps
2 participants