Update tox.ini for charmcraft 2

Also, this fixes an issue with pyopenssl Change-Id: I8cb2d6ffeb27f58d97a2d4f8b32ced3c527a5f5e
2022-09-27 14:01:43 -04:00 · 2022-09-27 14:01:43 -04:00 · efcd98746b
parent 9c7101f573
commit efcd98746b
3 changed files with 6 additions and 1 deletions
--- 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
--- 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
--- 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]