remove old files (#23)

.github/workflows/check.yaml

@@ -83,7 +83,7 @@ jobs:
       fail-fast: false
       matrix:
         runs-on: [[ubuntu-22.04]]
-        test-command: ['make functional']
+        test-command: ['tox -e func']
         juju-channel: ["3.4/stable"]
     steps:
 
@@ -116,8 +116,16 @@ jobs:
             echo "TEST_MODEL_CONSTRAINTS=arch=arm64" >> "$GITHUB_ENV"
           fi
 
+      - name: Build the charm
+        run: charmcraft -v pack
+
       - name: Run tests
-        run: ${{ matrix.test-command }}
+        run: |
+          export CHARM_PATH_JAMMY="$(pwd)/$(ls | grep '.*22.04.*\.charm$')"
+          echo "$CHARM_PATH_JAMMY"
+          export CHARM_PATH_FOCAL="$(pwd)/$(ls | grep '.*20.04.*\.charm$')"
+          echo "$CHARM_PATH_FOCAL"
+          ${{ matrix.test-command }}
         env:
           TEST_JUJU3: "1"  # https://github.com/openstack-charmers/zaza/pull/653
           TEST_JUJU_CHANNEL: ${{ matrix.juju-channel }}

tests/functional/tests/bundles/overlays/focal.yaml.j2

@@ -1,5 +1,6 @@
 series: focal
 applications:
   {{ charm_name }}:
+    charm: "{{ CHARM_PATH_FOCAL }}"
     options:
       juju-channel: {{ TEST_JUJU_CHANNEL }}

tests/functional/tests/bundles/overlays/jammy.yaml.j2

@@ -1,5 +1,6 @@
 series: jammy
 applications:
   {{ charm_name }}:
+    charm: "{{ CHARM_PATH_JAMMY }}"
     options:
-      juju-channel: {{ TEST_JUJU_CHANNEL }}
+      juju-channel: {{ TEST_JUJU_CHANNEL }}

tox.ini

@@ -8,8 +8,8 @@ basepython = python3
 passenv =
   HOME
   OS_*
-  JUJU_REPOSITORY
   TEST_*
+  CHARM_*
 
 setenv =
   PYTHONPATH = .
@@ -25,16 +25,6 @@ deps =
     -r {toxinidir}/tests/functional/requirements.txt
 commands = functest-run-suite --keep-faulty-model {posargs}
 
-[testenv:func-smoke]
-commands =
-    functest-run-suite --keep-faulty-model --smoke
-deps = -r{toxinidir}/test-requirements.txt
-passenv =
-  HOME
-  JUJU_REPOSITORY
-  OS_*
-  TEST_*
-
 [testenv:lint]
 commands =
     black --check reactive lib tests