Add conditional logic to allow CI and Make

.github/actions/charm-run-task/action.yaml

@@ -0,0 +1,27 @@
+name: 'Task Runner'
+description: 'Run tests for a charm'
+inputs:
+  charm-path:
+    description: 'Path to the charm'
+    required: true
+  test-type:
+    description: 'Test type (e.g., lint, fmt, etc.)'
+    required: true
+  tox-command:
+    description: 'The tox command options and environment (e.g. -vve lint)'
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Run test
+      shell: bash
+      run: |
+        cd ${{ inputs.charm-path }}
+        if [ -f tox.ini ]; then
+          tox ${{ inputs.tox-command }}  # If the tox.ini file exists, run Tox
+        else
+          if grep -q -E "^\s*${{ inputs.test-type }}:" Makefile; then
+            make ${{ inputs.test-type }}  # If the test type exists, run it with Make
+          fi
+        fi

.github/workflows/_charm-linting.yaml

@@ -21,6 +21,12 @@ jobs:
         with:
           python-version: 3.8
       - name: Install dependencies
-        run: python3 -m pip install tox
-      - name: Run linters
-        run: cd ${{ inputs.charm-path }} && tox -vve lint
+        run: |
+          python3 -m pip install tox
+          sudo snap install --classic astral-uv
+      - name: Run tests
+        uses: canonical/observability/.github/actions/charm-run-task@main
+        with:
+          charm-path: ${{ inputs.charm-path }}
+          test-type: lint
+          tox-command: -vve lint

.github/workflows/_charm-static-analysis.yaml

@@ -21,9 +21,15 @@ jobs:
         with:
           python-version: 3.8
       - name: Install dependencies
-        run: python3 -m pip install tox
+        run: |
+          python3 -m pip install tox
+          sudo snap install --classic astral-uv
       - name: Run static analysis for /lib for 3.8
-        run: cd ${{ inputs.charm-path }} && tox -vve static-lib
+        uses: canonical/observability/.github/actions/charm-run-task@main
+        with:
+          charm-path: ${{ inputs.charm-path }}
+          test-type: static
+          tox-command: -vve static-lib
   static-charm:
     name: Static Analysis of Charm
     runs-on: ubuntu-latest
@@ -37,6 +43,12 @@ jobs:
         with:
           python-version: 3.8
       - name: Install dependencies
-        run: python3 -m pip install tox
+        run: |
+          python3 -m pip install tox
+          sudo snap install --classic astral-uv
       - name: Run static analysis (charm)
-        run: cd ${{ inputs.charm-path }} && tox -vve static-charm
+        uses: canonical/observability/.github/actions/charm-run-task@main
+        with:
+          charm-path: ${{ inputs.charm-path }}
+          test-type: static
+          tox-command: -vve static-charm

.github/workflows/_charm-tests-integration.yaml

@@ -65,8 +65,15 @@ jobs:
           microk8s-group: snap_microk8s
           microk8s-addons: "hostpath-storage dns metallb:${{ inputs.ip-range || steps.ip_range.outputs.ip_range }}"
           charmcraft-channel: "${{ inputs.charmcraft-channel }}"
-      - name: Run integration tests
-        run: cd ${{ inputs.charm-path }} && tox -vve integration
+      - name: Install dependencies
+        run: |
+          sudo snap install --classic astral-uv
+      - name: Run tests
+        uses: canonical/observability/.github/actions/charm-run-task@main
+        with:
+          charm-path: ${{ inputs.charm-path }}
+          test-type: integration
+          tox-command: -vve integration
       - name: Dump logs
         if: failure()
         uses: canonical/charming-actions/dump-logs@main

.github/workflows/_charm-tests-scenario.yaml

@@ -21,6 +21,12 @@ jobs:
         with:
           python-version: 3.8
       - name: Install dependencies
-        run: python -m pip install tox
+        run: |
+          python -m pip install tox
+          sudo snap install --classic astral-uv
       - name: Run tests
-        run: cd ${{ inputs.charm-path }} && tox -e scenario
+        uses: canonical/observability/.github/actions/charm-run-task@main
+        with:
+          charm-path: ${{ inputs.charm-path }}
+          test-type: scenario
+          tox-command: -e scenario

.github/workflows/_charm-tests-unit.yaml

@@ -21,6 +21,12 @@ jobs:
         with:
           python-version: 3.8
       - name: Install dependencies
-        run: python -m pip install tox
+        run: |
+          python -m pip install tox
+          sudo snap install --classic astral-uv
       - name: Run tests
-        run: cd ${{ inputs.charm-path }} && tox -e unit
+        uses: canonical/observability/.github/actions/charm-run-task@main
+        with:
+          charm-path: ${{ inputs.charm-path }}
+          test-type: unit
+          tox-command: -e unit