From efcd98746b5f10502e1ee16a823ee6d0b6f64227 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris@centauri.solutions>
Date: Tue, 27 Sep 2022 14:01:43 -0400
Subject: [PATCH] Update tox.ini for charmcraft 2

Also, this fixes an issue with pyopenssl

Change-Id: I8cb2d6ffeb27f58d97a2d4f8b32ced3c527a5f5e
---
 osci.yaml             | 1 +
 test-requirements.txt | 4 ++++
 tox.ini               | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osci.yaml b/osci.yaml
index 6970c873..0a254da2 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -8,6 +8,7 @@
       needs_charm_build: true
       charm_build_name: ceph-mon
       build_type: charmcraft
+      charmcraft_channel: 2.0/stable
     check:
       jobs:
         - new-install-focal-yoga
diff --git a/test-requirements.txt b/test-requirements.txt
index eee61b69..20e94a7c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -49,3 +49,7 @@ tempest<30.0.0;python_version<'3.8' and python_version >= '3.6'
 tempest<24.0.0;python_version<'3.6'
 
 croniter            # needed for charm-rabbitmq-server unit tests
+
+# icey: pyopenssl 22 introduces a requirement on newer OpenSSL which causes test
+# failures. Pin pyopenssl to resolve the failure.
+pyopenssl<=22.0.0
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index b22b7bb2..483e561a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,7 +48,7 @@ basepython = python3
 deps = -r{toxinidir}/build-requirements.txt
 commands =
     charmcraft clean
-    charmcraft -v build
+    charmcraft -v pack
     {toxinidir}/rename.sh
 
 [testenv:py36]