fix integration test action to be compatible with the publish one

.github/workflows/integration_test.yaml

@@ -1,35 +1,20 @@
 name: Integration tests
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
   workflow_call:
+
 jobs:
-  integration-test-microk8s:
-    name: Integration tests (microk8s)
-    strategy:
-      fail-fast: false
-      matrix:
-        tox-environments:
-          - integration-charm
-          - integration-scaling
-          - integration-upgrades
-          - integration-policy
-          - integration-usersync
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Free disk space
-        uses: canonical/free-disk-space@main
-        with:
-          android: true
-          dotnet: true
-          haskell: true
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup operator environment
-        uses: charmed-kubernetes/actions-operator@main
-        with:
-          juju-channel: 3.4/stable
-          provider: microk8s
-          microk8s-addons: "ingress storage dns rbac registry"
-          channel: 1.28-strict/stable
-      - name: Run integration tests
-        run: tox -e ${{ matrix.tox-environments }}
+  integration-tests:
+    uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
+    secrets: inherit
+    with:
+      channel: 1.28-strict/stable
+      modules: '["test_charm.py", "test_policy.py", "test_usersync.py", "test_scaling.py", "test_upgrades.py"]'
+      juju-channel: 3.4/stable
+      self-hosted-runner: false
+      microk8s-addons: "dns ingress rbac storage metallb:10.15.119.2-10.15.119.4 registry"

.github/workflows/test_and_publish_charm.yaml → .github/workflows/publish_charm.yaml

@@ -6,7 +6,7 @@ on:
       - main
 
 jobs:
-  publish-to-edge:
+  publish:
     uses: canonical/operator-workflows/.github/workflows/publish_charm.yaml@main
     secrets: inherit
     with:

tests/conftest.py

@@ -0,0 +1,16 @@
+# Copyright 2023 Canonical Ltd.
+# See LICENSE file for licensing details.
+
+"""Fixtures for charm tests."""
+
+import pytest
+
+
+def pytest_addoption(parser: pytest.Parser):
+    """Parse additional pytest options.
+
+    Args:
+        parser: pytest command line parser.
+    """
+    # The prebuilt charm file.
+    parser.addoption("--charm-file", action="append", default=[])

tests/integration/__init__.py

@@ -0,0 +1,4 @@
+# Copyright 2023 Canonical Ltd.
+# See LICENSE file for licensing details.
+
+"""Tests module."""

tests/integration/conftest.py

@@ -7,7 +7,7 @@
 
 import pytest
 import pytest_asyncio
-from helpers import APP_NAME, METADATA, POSTGRES_NAME
+from integration.helpers import APP_NAME, METADATA, POSTGRES_NAME
 from pytest_operator.plugin import OpsTest
 
 logger = logging.getLogger(__name__)

tests/integration/test_charm.py

@@ -7,8 +7,14 @@
 
 import pytest
 import requests
-from conftest import deploy  # noqa: F401, pylint: disable=W0611
-from helpers import APP_NAME, METADATA, NGINX_NAME, POSTGRES_NAME, get_unit_url
+from integration.conftest import deploy  # noqa: F401, pylint: disable=W0611
+from integration.helpers import (
+    APP_NAME,
+    METADATA,
+    NGINX_NAME,
+    POSTGRES_NAME,
+    get_unit_url,
+)
 from pytest_operator.plugin import OpsTest
 
 logger = logging.getLogger(__name__)

tests/integration/test_policy.py

@@ -7,7 +7,7 @@
 
 import pytest
 from apache_ranger.client import ranger_client
-from helpers import (
+from integration.helpers import (
     APP_NAME,
     RANGER_AUTH,
     TRINO_NAME,

tests/integration/test_scaling.py

@@ -7,7 +7,7 @@
 
 import pytest
 import requests
-from helpers import APP_NAME, get_application_url, scale
+from integration.helpers import APP_NAME, get_application_url, scale
 from pytest_operator.plugin import OpsTest
 
 logger = logging.getLogger(__name__)

tests/integration/test_upgrades.py

@@ -10,7 +10,13 @@
 import pytest_asyncio
 import requests
 import yaml
-from helpers import APP_NAME, METADATA, POSTGRES_NAME, SECURE_PWD, get_unit_url
+from integration.helpers import (
+    APP_NAME,
+    METADATA,
+    POSTGRES_NAME,
+    SECURE_PWD,
+    get_unit_url,
+)
 from pytest_operator.plugin import OpsTest
 
 logger = logging.getLogger(__name__)

tests/integration/test_usersync.py

@@ -7,7 +7,7 @@
 import time
 
 import pytest
-from helpers import (
+from integration.helpers import (
     APP_NAME,
     LDAP_NAME,
     METADATA,