From 01b68a58407a8370a6bab73292d06caa4be8099a Mon Sep 17 00:00:00 2001 From: Samuel Allan Date: Thu, 26 Sep 2024 10:07:21 +0930 Subject: [PATCH] Update juju controller for cos integration tests --- .github/workflows/cos_integration.yaml | 11 ++--------- tests/integration/requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cos_integration.yaml b/.github/workflows/cos_integration.yaml index 4b01689f..70d74bd3 100644 --- a/.github/workflows/cos_integration.yaml +++ b/.github/workflows/cos_integration.yaml @@ -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 @@ -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: diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt index 67679715..caaa3d30 100644 --- a/tests/integration/requirements.txt +++ b/tests/integration/requirements.txt @@ -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 \ No newline at end of file +tenacity