From aaa5fca4873ed3c460ee58471f3286937174f43e Mon Sep 17 00:00:00 2001
From: Hemanth Nakkina <hemanth.nakkina@canonical.com>
Date: Wed, 8 Mar 2023 09:21:39 +0530
Subject: [PATCH] Use juju 3.1 for CI tests

Update the snaps to use in functional tests:
juju snap to 3.1 and microk8s snap to 1.26-strict.

Update zaza requirement to use libjuju-3.1 branch.

Change-Id: I9d11caa4dc2176a72297c6cc1e406372d906d048
---
 .zuul.yaml | 4 ++++
 tox.ini    | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 795b4d4..1fc67e3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,3 +5,7 @@
       - microk8s-func-test
     vars:
       charm_build_name: ovn-relay-k8s
+      juju_channel: 3.1/stable
+      juju_classic_mode: false
+      microk8s_channel: 1.26-strict/stable
+      microk8s_classic_mode: false
diff --git a/tox.ini b/tox.ini
index b954952..596ebb3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,6 +24,7 @@ setenv =
   PYTHONPATH = {toxinidir}:{[vars]lib_path}:{[vars]src_path}
 passenv =
   PYTHONPATH
+  HOME
 install_command =
   pip install {opts} {packages}
 commands = stestr run --slowest {posargs}
@@ -116,7 +117,7 @@ commands =
 [testenv:func-noop]
 basepython = python3
 deps =
-    git+https://github.com/openstack-charmers/zaza.git#egg=zaza
+    git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
     git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
     git+https://opendev.org/openstack/tempest.git#egg=tempest
 commands =