Retry using lxd instead of microk8s.

Author: Juan Tirado

.github/workflows/test.yaml

@@ -3,6 +3,26 @@ name: Integration test
 on: [push, pull_request]
 
 jobs:
+  unit-tests:
+    name: Unit tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v3
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Run unit tests
+      run: tox -e py3
+    
+
   integration:
     name: Integration
     runs-on: ubuntu-latest
@@ -15,46 +35,18 @@ jobs:
     steps:
     - name: Check out code
       uses: actions/checkout@v3
-    # - name: Install LXD
-    #   if: ${{ !env.ACT }}
-    #   shell: bash
-    #   # language=bash
-    #   run: |
-    #     set -euxo pipefail      
-    #     sudo lxd waitready
-    #     sudo lxd init --auto
-    #     sudo chmod a+wr /var/snap/lxd/common/lxd/unix.socket
-    #     echo "/snap/bin" >> $GITHUB_PATH
     - name: Setup operator environment
       uses: charmed-kubernetes/actions-operator@main
       with:
-        provider: microk8s
+        provider: lxd
         juju-channel: 3.0/stable
-        channel: 1.25-strict/stable
-        microk8s-group: snap_microk8s
-    # - name: Install juju
-    #   shell: bash
-    #   env: 
-    #     JUJU_CHANNEL: "3.0/candidate"
-    #   # language=bash
-    #   run: |
-    #     set -euxo pipefail
-    #     sudo snap install juju --channel=$JUJU_CHANNEL
-    # - name: Bootstrap controller
-    #   shell: bash
-    #   # language=bash
-    #   run: |
-    #     sudo usermod -a -G snap_microk8s runner
-    #     newgrp snap_microk8s
-    #     sudo mkdir /home/runner/.ssh
-    #     juju bootstrap microk8s test --debug    
+        #channel: 1.25-strict/stable
+        #microk8s-group: snap_microk8s
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
     - name: Install dependencies
       run: pip install tox
-    - name: Run unit tests
-      run: tox -e py3
     - name: Run integration
       run: tox -e py3 -e integration,serial

juju/jasyncio.py

@@ -31,23 +31,24 @@
 from asyncio import Event, TimeoutError, Queue, ensure_future, \
     gather, sleep, wait_for, create_subprocess_exec, subprocess, \
     wait, FIRST_COMPLETED, Lock, as_completed, new_event_loop, \
-    get_event_loop_policy, CancelledError # noqa
-
-
-try:
-    from asyncio import get_running_loop
-except ImportError:
-    def get_running_loop():
-        loop = asyncio.get_event_loop()
-        if not loop.is_running():
-            raise RuntimeError("no running event loop")
-        return loop
-
-try:
-    from asyncio import create_task
-except ImportError:
-    def create_task(coro):
-        return asyncio.ensure_future(coro)
+    get_event_loop_policy, CancelledError, get_running_loop, \
+    create_task     # noqa
+
+# No more workaround for these imports
+# try:
+#     from asyncio import get_running_loop
+# except ImportError:
+#     def get_running_loop():
+#         loop = asyncio.get_event_loop()
+#         if not loop.is_running():
+#             raise RuntimeError("no running event loop")
+#         return loop
+
+# try:
+#     from asyncio import create_task
+# except ImportError:
+#     def create_task(coro):
+#         return asyncio.ensure_future(coro)
 
 
 def create_task_with_handler(coro, task_name, logger=ROOT_LOGGER):

setup.py

@@ -36,7 +36,6 @@
         'pyRFC3339>=1.0,<2.0',
         'pyyaml>=5.1.2,<=6.0',
         'theblues>=0.5.1,<1.0',
-        'websockets>=7.0,<8.1 ; python_version<"3.8"',
         'websockets>=8.1,<9.0 ; python_version=="3.8"',
         'websockets>=9.0,<10.0 ; python_version=="3.9"',
         'websockets>=10.0; python_version>"3.9"',
@@ -58,8 +57,6 @@
         "Intended Audience :: Developers",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",

tests/integration/test_application.py

@@ -143,10 +143,10 @@ async def test_deploy_charmstore_charm(event_loop):
 @pytest.mark.asyncio
 async def test_deploy_charmhub_charm(event_loop):
     async with base.CleanModel() as model:
-        app = await model.deploy('ch:hello-juju')
+        app = await model.deploy('ch:hello-kubecon')
         await model.block_until(lambda: (len(app.units) > 0 and
                                          app.units[0].machine))
-        assert 'hello-juju' in app.data['charm-url']
+        assert 'hello-kubecon' in app.data['charm-url']
 
 
 @base.bootstrapped
@@ -179,6 +179,7 @@ async def test_upgrade_charm_channel(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Skip until a similar k8s solution is found')
 async def test_upgrade_charm_switch_channel(event_loop):
     # Note for future:
     # This test requires a charm that has different

tests/integration/test_charmhub.py

@@ -96,6 +96,7 @@ async def test_find_all(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('This tries to test juju controller logic')
 async def test_subordinate_charm_zero_units(event_loop):
     # normally in pylibjuju deploy num_units defaults to 1, we switch
     # that to 0 behind the scenes if we see that the charmhub charm

tests/integration/upgrade-charm/metadata.yaml

@@ -1,5 +1,5 @@
 name: ubuntu
-series: ["bionic", "focal"]
+series: ["focal", "jammy"]
 summary: "test"
 description: "test"
 maintainers: ["test"]