test: Remove unused dependency and change functional test command to …

…use juju3.1

.github/workflows/check.yaml

@@ -21,19 +21,24 @@ jobs:
       tox-version: "<4"
 
   func:
-    uses: canonical/bootstack-actions/.github/workflows/func.yaml@v2
+    uses: canonical/bootstack-actions/.github/workflows/func.yaml@v3-external-openstack
     needs: lint-unit
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - juju-channel: "3.1/stable"
-            command: "make functional"
     with:
-      command: ${{ matrix.command }}
-      juju-channel: ${{ matrix.juju-channel }}
+      command: "make functional31"
+      juju-channel: "3.1/stable"
       nested-containers: false
       provider: "lxd"
       python-version: "3.10"
       timeout-minutes: 120
       tox-version: "<4"
+      runs-on: "['self-hosted', 'runner-juju-local-a']"
+      action-operator: false
+      external-controller: true
+      juju-controller: soleng-ci-ctrl
+      zaza-yaml: "LS0tCm1vZGVsX3NldHRpbmdzOgogIGltYWdlLXN0cmVhbTogcmVsZWFzZWQKcmVnaW9uOiBwcm9kc3RhY2s2CmNsb3VkOiBidWlsZGVyLWNsb3VkCmNyZWRlbnRpYWw6IGJ1aWxkZXItY2xvdWQtY3JlZAo="
+    secrets:
+      juju-controllers-yaml: ${{ secrets.JUJU_CONTROLLERS_YAML }}
+      juju-accounts-yaml: ${{ secrets.JUJU_ACCOUNTS_YAML }}
+      openstack-auth-env: ${{ secrets.OPENSTACK_AUTH_ENV }}

tests/functional/requirements.txt

@@ -1,2 +1,2 @@
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
-git+https://github.com/openstack-charmers/[email protected]#egg=zaza
+git+https://github.com/jneo8/[email protected]-config-cred#egg=zaza

tox.ini

@@ -28,7 +28,6 @@ commands = functest-run-suite --keep-faulty-model {posargs}
 changedir = {toxinidir}/tests/functional
 deps =
     -r {toxinidir}/tests/functional/requirements.txt
-    git+https://github.com/esunar/zaza.git@fix-normalise_action_results#egg=zaza[juju-31]
 commands = functest-run-suite --keep-faulty-model {posargs}
 
 [testenv:func-smoke]