Merge pull request #135 from freyes/pin-libjuju

Pin python-libjuju for OpenStack<=bobcat
openstack-charmers · Feb 28, 2024 · 34736a5 · 34736a5
2 parents fb5c28e + 478249e
commit 34736a5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/constraints.txt 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
@@ -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
@@ -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}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Pin python-libjuju until it gets validated against juju-3.x
		juju<3.0.0