From 478249e0fe493dd5f3a7acf48d58b984c0b71841 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Tue, 27 Feb 2024 18:22:53 -0300
Subject: [PATCH] Pin python-libjuju for OpenStack<=bobcat

OpenStack<=bobcat has been validated by charmed-openstack-tester, while
juju-3.x is being introduced for OpenStack 2024.1 (Caracal).

This change introduces a constraints file which by default pins
python-libjuju<3.0.0 while zaza-openstack-tests constraints file is used
for the *-caracal jobs and the juju_snap_channel set to 3.1/stable
---
 constraints.txt | 2 ++
 osci.yaml       | 6 ++++++
 tox.ini         | 4 +++-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 constraints.txt

diff --git a/constraints.txt b/constraints.txt
new file mode 100644
index 00000000..d4203574
--- /dev/null
+++ b/constraints.txt
@@ -0,0 +1,2 @@
+# Pin python-libjuju until it gets validated against juju-3.x
+juju<3.0.0
diff --git a/osci.yaml b/osci.yaml
index 7a4e3056..553b1c5f 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -114,6 +114,8 @@
     parent: cot-func-target
     vars:
       tox_extra_args: '-- jammy-caracal'
+      juju_snap_channel: "3.1/stable"
+      pip_constraints_url: https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt
 - job:
     name: cot_distro-regression_lunar-antelope
     parent: cot-func-target
@@ -129,6 +131,8 @@
     parent: cot-func-target
     vars:
       tox_extra_args: '-- noble-caracal'
+      juju_snap_channel: "3.1/stable"
+      pip_constraints_url: https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt
 - job:
     name: cot_distro-regression_bionic-queens-security
     parent: cot-func-target
@@ -154,6 +158,8 @@
     parent: cot-func-target
     vars:
       tox_extra_args: '-- noble-caracal-security'
+      juju_snap_channel: "3.1/stable"
+      pip_constraints_url: https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt
 - job:
     name: cot_distro-regression_focal-ussuri-to-yoga-upgrades
     parent: cot-func-target
diff --git a/tox.ini b/tox.ini
index 8612be01..37a7cabd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,9 @@ passenv =
   CS_*
   OS_*
   TEST_*
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+  -c{env:TEST_CONSTRAINTS_FILE:{toxinidir}/constraints.txt}
+  -r{toxinidir}/test-requirements.txt
 install_command =
   pip install {opts} {packages}