Skip to content

Commit

Permalink
ci: update juju to 3.1 and microk8s to 1.25 (#147)
Browse files Browse the repository at this point in the history
ci: update juju to 3.1 and microk8s to 1.25
  • Loading branch information
NohaIhab authored Sep 11, 2023
1 parent 42fef35 commit 14f0d10
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ jobs:
uses: charmed-kubernetes/actions-operator@main
with:
provider: microk8s
channel: 1.24/stable
channel: 1.25-strict/stable
microk8s-addons: "dns storage rbac metallb:10.64.140.43-10.64.140.49"
charmcraft-channel: latest/candidate
juju-channel: 2.9/stable
juju-channel: 3.1/stable

- name: Build and test
run: |
sg microk8s -c "tox -vve integration -- --model testing"
sg snap_microk8s -c "tox -vve integration -- --model testing"
# On failure, capture debugging resources
- name: Get all
Expand Down
4 changes: 2 additions & 2 deletions requirements-integration.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Pinning to <3.0 to ensure compatibility with the 2.9 controller version
juju<3.0
# Pinning to <4.0 due to compatibility with the 3.1 controller version
juju<4.0
pytest
pytest-operator
pyyaml
Expand Down
41 changes: 19 additions & 22 deletions requirements-integration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile requirements-integration.in
#
asttokens==2.2.1
asttokens==2.4.0
# via stack-data
attrs==23.1.0
# via
Expand All @@ -16,7 +16,7 @@ bcrypt==4.0.1
# via paramiko
blinker==1.6.2
# via selenium-wire
brotli==1.0.9
brotli==1.1.0
# via selenium-wire
cachetools==5.3.1
# via google-auth
Expand All @@ -40,7 +40,7 @@ decorator==5.1.1
# via
# ipdb
# ipython
exceptiongroup==1.1.2
exceptiongroup==1.1.3
# via
# pytest
# trio
Expand All @@ -55,6 +55,8 @@ h2==4.1.0
# via selenium-wire
hpack==4.0.0
# via h2
hvac==1.2.0
# via juju
hyperframe==6.0.1
# via
# h2
Expand All @@ -73,20 +75,16 @@ jedi==0.19.0
# via ipython
jinja2==3.1.2
# via pytest-operator
juju==2.9.44.0
juju==3.2.2
# via
# -r requirements-integration.in
# pytest-operator
jujubundlelib==0.5.7
# via theblues
kaitaistruct==0.10
# via selenium-wire
kubernetes==27.2.0
# via juju
macaroonbakery==1.3.1
# via
# juju
# theblues
# via juju
markupsafe==2.1.3
# via jinja2
matplotlib-inline==0.1.6
Expand All @@ -109,7 +107,7 @@ pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
pluggy==1.2.0
pluggy==1.3.0
# via pytest
prompt-toolkit==3.0.39
# via ipython
Expand All @@ -131,6 +129,8 @@ pycparser==2.21
# via cffi
pygments==2.16.1
# via ipython
pyhcl==0.4.5
# via hvac
pymacaroons==0.13.0
# via macaroonbakery
pynacl==1.5.0
Expand All @@ -150,38 +150,37 @@ pysocks==1.7.1
# via
# selenium-wire
# urllib3
pytest==7.4.0
pytest==7.4.2
# via
# -r requirements-integration.in
# pytest-asyncio
# pytest-operator
pytest-asyncio==0.21.1
# via pytest-operator
pytest-operator==0.28.0
pytest-operator==0.29.0
# via -r requirements-integration.in
python-dateutil==2.8.2
# via kubernetes
pytz==2023.3
pytz==2023.3.post1
# via pyrfc3339
pyyaml==6.0.1
# via
# -r requirements-integration.in
# juju
# jujubundlelib
# kubernetes
# pytest-operator
requests==2.31.0
# via
# -r requirements-integration.in
# hvac
# kubernetes
# macaroonbakery
# requests-oauthlib
# theblues
requests-oauthlib==1.3.1
# via kubernetes
rsa==4.9
# via google-auth
selenium==4.11.2
selenium==4.12.0
# via
# -r requirements-integration.in
# selenium-wire
Expand All @@ -202,10 +201,8 @@ sortedcontainers==2.4.0
# via trio
stack-data==0.6.2
# via ipython
tenacity==8.2.2
tenacity==8.2.3
# via -r requirements-integration.in
theblues==0.5.2
# via juju
tomli==2.0.1
# via
# ipdb
Expand All @@ -220,7 +217,7 @@ trio==0.22.2
# via
# selenium
# trio-websocket
trio-websocket==0.10.3
trio-websocket==0.10.4
# via selenium
typing-extensions==4.7.1
# via
Expand All @@ -235,9 +232,9 @@ urllib3[socks]==2.0.4
# selenium
wcwidth==0.2.6
# via prompt-toolkit
websocket-client==1.6.1
websocket-client==1.6.2
# via kubernetes
websockets==7.0
websockets==8.1
# via juju
wsproto==1.2.0
# via
Expand Down

0 comments on commit 14f0d10

Please sign in to comment.