Update test scripts

Author: lmlg

.github/workflows/build-and-test.yml

@@ -23,8 +23,6 @@ jobs:
         id: changed-files
         if: ${{ github.event_name != 'workflow_dispatch' }}
         uses: tj-actions/changed-files@v35
-        with:
-          since_last_remote_commit: false
 
       - name: Determine charms to build/test
         id: determine-parts
@@ -101,7 +99,7 @@ jobs:
       - name: Upload built charm
         uses: actions/upload-artifact@v4
         with:
-          name: charm-${{ matrix.part }}
+          name: charm-artifact-${{ matrix.part }}
           path: "./${{ matrix.part }}/*.charm"
 
   functional-test:
@@ -119,7 +117,8 @@ jobs:
       - name: Download charm
         uses: actions/download-artifact@v4
         with:
-          name: charm-${{ matrix.part }}
+          pattern: charm-artifact-*
+          merge-multiple: true
           path: ~/artifacts/
 
       - name: Checkout code
@@ -142,26 +141,20 @@ jobs:
             lxd init --minimal
           fi
 
-      - name: Install dependencies
+      - name: Install and configure tests
         run: |
-          sudo apt -y install tox
-          if [ ! -d "$HOME/.local/share/juju" ]; then
-            sudo snap install juju --channel=3.6/stable
-            mkdir -p ~/.local/share/juju
-            juju bootstrap localhost localhost
-          fi
-
-          sudo snap install --classic juju-crashdump
+          date
+          ~/actionutils.sh setup_functest
+          ~/actionutils.sh cacheimgs "ubuntu@22.04"
 
       - name: Run the tests
         run: |
           date
-          ~/actionutils.sh cacheimgs "ubuntu:22.04"
           mv ~/artifacts/*.charm ./
           if [[ -f "./${{ matrix.part }}/src/tox.ini" ]]; then
-            tox -c ${{ matrix.part }}/src -e func-target -- jammy-bobcat
+            tox -c ${{ matrix.part }}/src -e func-dev
           else
-            tox -c ${{ matrix.part }} -e func-target -- jammy-bobcat
+            tox -c ${{ matrix.part }} -e func-dev
           fi
 
       - name: Generate crash dumps

tests/configs/dot.zaza.yaml

@@ -0,0 +1,6 @@
+---
+model_settings:
+    logging-config: "<root>=INFO;unit=DEBUG"
+
+runtime_config:
+  TEST_MAX_RESOLVE_COUNT: 5

tests/configs/model-defaults.yaml

@@ -0,0 +1,4 @@
+test-mode: true
+automatically-retry-hooks: true
+logging-config: "<root>=DEBUG"
+enable-os-upgrade: false

tests/scripts/actionutils.sh

@@ -10,13 +10,30 @@ function cleaript() {
 }
 
 function cacheimgs() {
-    lxc launch $1 ctemp 2>&1 >/dev/null
-    lxc launch $1 vmtemp --vm -c limits.cpu=2 -c limits.memory=4GiB -d root,size=25GiB 2>&1 >/dev/null
-    lxc stop ctemp
-    lxc delete ctemp
-    sleep 60
-    lxc stop vmtemp
-    lxc delete vmtemp
+    local base="${1?missing}"
+    juju add-model dummy
+    juju add-machine --base "$base"
+    sleep 10
+    juju add-machine --base "$base" --constraints "virt-type=virtual-machine" 
+    while [ "$(juju machines | egrep -wc 'started')" -ne 2 ]; do
+        sleep 2
+    done
+    juju destroy-model --force --timeout 20s  --no-prompt dummy
+    sleep 5
+}
+
+function setup_functest() {
+    sudo apt -y install tox
+    if [ ! -d "$HOME/.local/share/juju" ]; then
+        sudo snap install juju --channel=3.6/stable
+        mkdir -p ~/.local/share/juju
+        juju bootstrap \
+             --auto-upgrade=false \
+             --model-default=tests/configs/model-defaults.yaml \
+             localhost localhost
+    fi
+    sudo snap install --classic juju-crashdump
+    cp tests/configs/dot.zaza.yaml ~/.zaza.yaml
 }
 
 run="${1}"