update to latest workflow (#156)

.github/workflows/integration_test.yaml

@@ -10,7 +10,7 @@ jobs:
     with:
       channel: 1.28-strict/stable
       extra-arguments: |
-        --kube-config ${GITHUB_WORKSPACE}/kube-config
+        --kube-config=${GITHUB_WORKSPACE}/kube-config
       modules: '["test_auth_proxy.py", "test_cos.py", "test_ingress.py", "test_jenkins.py", "test_k8s_agent.py", "test_machine_agent.py", "test_plugins.py", "test_proxy.py", "test_upgrade.py", "test_external_agent.py"]'
       pre-run-script: |
         -c "sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config

tests/conftest.py

@@ -13,7 +13,7 @@ def pytest_addoption(parser: pytest.Parser):
         parser: pytest command line parser.
     """
     # The prebuilt charm file.
-    parser.addoption("--charm-file", action="store", default="")
+    parser.addoption("--charm-file", action="append", default=[])
     # The Jenkins image name:tag.
     parser.addoption("--jenkins-image", action="store", default="")
     # The path to kubernetes config.

tests/integration/conftest.py

@@ -7,6 +7,7 @@
 import random
 import secrets
 import string
+from pathlib import Path
 from typing import AsyncGenerator, Generator, Iterable, Optional
 
 import jenkinsapi.jenkins
@@ -78,14 +79,14 @@ def num_units_fixture(request: FixtureRequest) -> int:
 
 
 @pytest_asyncio.fixture(scope="module", name="charm")
-async def charm_fixture(request: FixtureRequest, ops_test: OpsTest) -> str:
+async def charm_fixture(request: FixtureRequest, ops_test: OpsTest) -> str | Path:
     """The path to charm."""
-    charm = request.config.getoption("--charm-file")
-    if not charm:
+    charms = request.config.getoption("--charm-file")
+    if not charms:
         charm = await ops_test.build_charm(".")
-    else:
-        charm = f"./{charm}"
-    return charm
+        assert charm, "Charm not built"
+        return charm
+    return charms[0]
 
 
 @pytest_asyncio.fixture(scope="module", name="application")