From 7af7d94d543faf92b27d9f5daa99cfdd8c403768 Mon Sep 17 00:00:00 2001 From: Daniela Plascencia Date: Mon, 7 Aug 2023 16:55:10 +0200 Subject: [PATCH] build: bump juju 2.9.44.0, sdi->0.7.0, pyyaml->6.0.1 (#306) * build: bump juju 2.9.44.0, sdi->0.7.0, pyyaml->6.0.1 Part of canonical/bundle-kubeflow#648 * ci: install juju from channel 2.9/stable --- .github/workflows/integrate.yaml | 4 +++- charms/istio-gateway/requirements-unit.txt | 6 +++--- charms/istio-gateway/requirements.txt | 6 +++--- charms/istio-pilot/requirements-unit.txt | 6 +++--- charms/istio-pilot/requirements.txt | 6 +++--- requirements-integration.txt | 6 +++--- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 6b7d2a2f..82ee5723 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -59,7 +59,7 @@ jobs: run: | set -eux sudo snap install charmcraft --classic --channel=latest/candidate - sudo snap install juju --classic + sudo snap install juju --channel=2.9/stable --classic sudo snap install juju-bundle --classic sudo snap install juju-wait --classic sudo apt update @@ -136,6 +136,8 @@ jobs: channel: 1.24/stable # Pinning juju agent to 2.9.42 to keep compatibility with pythonlib-juju<3 bootstrap-options: --agent-version="2.9.42" + juju-channel: 2.9/stable + - run: sg microk8s -c "microk8s enable metallb:'10.64.140.43-10.64.140.49,192.168.0.105-192.168.0.111'" - run: juju add-model cos-test diff --git a/charms/istio-gateway/requirements-unit.txt b/charms/istio-gateway/requirements-unit.txt index b6a98fd2..707db95d 100644 --- a/charms/istio-gateway/requirements-unit.txt +++ b/charms/istio-gateway/requirements-unit.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-unit.in +# pip-compile requirements-unit.in # anyio==3.7.0 # via @@ -96,7 +96,7 @@ pytest-lazy-fixture==0.6.3 # via -r requirements-unit.in pytest-mock==3.10.0 # via -r requirements-unit.in -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements.txt # lightkube @@ -106,7 +106,7 @@ requests==2.31.0 # via # -r requirements.txt # serialized-data-interface -serialized-data-interface==0.6.0 +serialized-data-interface==0.7.0 # via -r requirements.txt sniffio==1.3.0 # via diff --git a/charms/istio-gateway/requirements.txt b/charms/istio-gateway/requirements.txt index 86a30eed..3e6f6948 100644 --- a/charms/istio-gateway/requirements.txt +++ b/charms/istio-gateway/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements.in +# pip-compile requirements.in # anyio==3.7.0 # via httpcore @@ -52,7 +52,7 @@ pkgutil-resolve-name==1.3.10 # via jsonschema pyrsistent==0.19.3 # via jsonschema -pyyaml==6.0 +pyyaml==6.0.1 # via # lightkube # ops @@ -61,7 +61,7 @@ requests==2.31.0 # via # -r requirements.in # serialized-data-interface -serialized-data-interface==0.6.0 +serialized-data-interface==0.7.0 # via -r requirements.in sniffio==1.3.0 # via diff --git a/charms/istio-pilot/requirements-unit.txt b/charms/istio-pilot/requirements-unit.txt index 98ce3008..5d034042 100644 --- a/charms/istio-pilot/requirements-unit.txt +++ b/charms/istio-pilot/requirements-unit.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-unit.in +# pip-compile requirements-unit.in # anyio==3.7.0 # via @@ -113,7 +113,7 @@ pytest-lazy-fixture==0.6.3 # via -r requirements-unit.in pytest-mock==3.10.0 # via -r requirements-unit.in -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements.txt # lightkube @@ -131,7 +131,7 @@ ruamel-yaml-clib==0.2.7 # via # -r requirements.txt # ruamel-yaml -serialized-data-interface==0.6.0 +serialized-data-interface==0.7.0 # via -r requirements.txt sniffio==1.3.0 # via diff --git a/charms/istio-pilot/requirements.txt b/charms/istio-pilot/requirements.txt index 39e7f94d..13037315 100644 --- a/charms/istio-pilot/requirements.txt +++ b/charms/istio-pilot/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements.in +# pip-compile requirements.in # anyio==3.7.0 # via httpcore @@ -63,7 +63,7 @@ pkgutil-resolve-name==1.3.10 # via jsonschema pyrsistent==0.19.3 # via jsonschema -pyyaml==6.0 +pyyaml==6.0.1 # via # lightkube # ops @@ -76,7 +76,7 @@ ruamel-yaml==0.17.31 # via charmed-kubeflow-chisme ruamel-yaml-clib==0.2.7 # via ruamel-yaml -serialized-data-interface==0.6.0 +serialized-data-interface==0.7.0 # via -r requirements.in sniffio==1.3.0 # via diff --git a/requirements-integration.txt b/requirements-integration.txt index a5c7a937..54a4d6e2 100644 --- a/requirements-integration.txt +++ b/requirements-integration.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-integration.in +# pip-compile requirements-integration.in # aiohttp==3.8.4 # via -r requirements-integration.in @@ -80,7 +80,7 @@ jedi==0.18.2 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.42.4 +juju==2.9.44.0 # via # -r requirements-integration.in # pytest-operator @@ -162,7 +162,7 @@ python-dateutil==2.8.2 # via kubernetes pytz==2023.3 # via pyrfc3339 -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements-integration.in # juju