From 73275af311cd9950cc3457aa952fa1df7561b040 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Tue, 22 Aug 2023 07:39:39 +0000 Subject: [PATCH] Permit Juju 3.1 Allow juju 3.1 as CMR fixes should have been backported and 3.1 has a longer life than 3.2 Change-Id: Ic1cb4668cc63fe458dd0181c66a8e15d6c5d289d --- charms/glance-k8s/.zuul.yaml | 11 +++++++++-- charms/glance-k8s/metadata.yaml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/charms/glance-k8s/.zuul.yaml b/charms/glance-k8s/.zuul.yaml index 2581661e..bc7a5d35 100644 --- a/charms/glance-k8s/.zuul.yaml +++ b/charms/glance-k8s/.zuul.yaml @@ -2,10 +2,17 @@ templates: - openstack-python3-charm-yoga-jobs - openstack-cover-jobs - - microk8s-func-test +# - microk8s-func-test + check: + jobs: + - charmbuild: + nodeset: ubuntu-focal + - zaza-smoke-test: + nodeset: ubuntu-focal + voting: false vars: charm_build_name: glance-k8s - juju_channel: 3.2/stable + juju_channel: 3.1/stable juju_classic_mode: false microk8s_channel: 1.26-strict/stable microk8s_classic_mode: false diff --git a/charms/glance-k8s/metadata.yaml b/charms/glance-k8s/metadata.yaml index e66ae630..431e04d7 100644 --- a/charms/glance-k8s/metadata.yaml +++ b/charms/glance-k8s/metadata.yaml @@ -14,7 +14,7 @@ bases: channel: 22.04/stable assumes: - k8s-api - - juju >= 3.2 + - juju >= 3.1 tags: - openstack - storage