Skip to content

Commit

Permalink
Update juju controller for cos integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelallan72 committed Sep 26, 2024
1 parent b8cc2ba commit 01b68a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/cos_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ jobs:
uses: charmed-kubernetes/actions-operator@main
with:
# The juju version can be any stable version, as long as it is the same as libjuju version used.
# Currently, 3.1 is used to keep the version consistent with functional tests (func31)
# If, for example, 3.5/stable is used here in the future, the `update python-libjuju dependancy..`
# step below should also specify `...3.5.x/g'..` so it updates requirements.txt with the correct version.
juju-channel: 3.1/stable
# If you updated it here, update it also in tests/integration/requirements.txt
juju-channel: 3.5/stable
provider: lxd
- name: Save lxd controller name
id: lxd-controller
Expand All @@ -43,11 +41,6 @@ jobs:
- name: Fix microk8s permissions
run: |
chmod -R ugo+rwX ~/.kube
- name: Update python-libjuju dependency to match juju
# The juju CLI version and libjuju version(specified in requirements.txt) should be compatible.
# This replaces the libjuju version in requirements.txt and
# makes sure the same version is used, even if it has a different/incompatible version.
run: sed -E -i 's/^\s*juju\s*~=.+/ juju~=3.1.0/g' tests/integration/requirements.txt
- name: Run integration tests
run: tox -e integration
env:
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jinja2
juju~=3.1.0 # must be compatible with the juju CLI version installed by CI
juju~=3.5.0 # must be compatible with the juju CLI version installed by CI - see .github/workflows/cos_integration.yaml
pytest
pytest-operator
prometheus-client
pyinstaller # required to bundle export_mock_metrics script to send it to hw-oberver unit
tenacity
tenacity

0 comments on commit 01b68a5

Please sign in to comment.