add changes from plugin pr

.github/workflows/ci.yaml

@@ -133,7 +133,7 @@ jobs:
             echo "mark_expression=not unstable" >> "$GITHUB_OUTPUT"
           fi
       - name: Run integration tests
-        run: tox run -e integration -- "${{ matrix.groups.path_to_test_file }}" --group ${{ matrix.groups.group_number }} -m '${{ steps.select-test-stability.outputs.mark_expression }}' --mysql-charm-series="${{ matrix.ubuntu-versions.series }}" --mysql-charm-bases-index="${{ matrix.ubuntu-versions.bases-index }}"
+        run: tox run -e integration -- "${{ matrix.groups.path_to_test_file }}" --group="${{ matrix.groups.group_number }}" -m '${{ steps.select-test-stability.outputs.mark_expression }}' --mysql-charm-series="${{ matrix.ubuntu-versions.series }}" --mysql-charm-bases-index="${{ matrix.ubuntu-versions.bases-index }}"
         env:
           AWS_ACCESS_KEY: ${{ matrix.groups.path_to_test_file != 'tests/integration/test_backups.py' || secrets.AWS_ACCESS_KEY }}
           AWS_SECRET_KEY: ${{ matrix.groups.path_to_test_file != 'tests/integration/test_backups.py' || secrets.AWS_SECRET_KEY }}

pyproject.toml

@@ -61,7 +61,8 @@ tenacity = "^8.2.2"
 boto3 = "^1.28.11"
 pyyaml = "^6.0"
 urllib3 = "^1.26.16"
-pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", rev = "v3", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
+pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v4.0.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
+pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", branch = "pytest-plugin-groups", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
 
 
 [tool.coverage.run]

tests/conftest.py

@@ -1,15 +1,10 @@
 # Copyright 2022 Canonical Ltd.
 # See LICENSE file for licensing details.
-from argparse import ArgumentError
+
+import argparse
 
 
 def pytest_addoption(parser):
-    parser.addoption(
-        "--collect-groups",
-        action="store_true",
-        help="Collect test groups (used by GitHub Actions)",
-    )
-    parser.addoption("--group", type=int, help="Integration test group number")
     parser.addoption("--mysql-charm-series", help="Ubuntu series for mysql charm (e.g. jammy)")
     parser.addoption(
         "--mysql-charm-bases-index",
@@ -19,12 +14,10 @@ def pytest_addoption(parser):
 
 
 def pytest_configure(config):
-    if config.option.collect_groups:
-        config.option.collectonly = True
     if (config.option.mysql_charm_series is None) ^ (
         config.option.mysql_charm_bases_index is None
     ):
-        raise ArgumentError(
+        raise argparse.ArgumentError(
             None, "--mysql-charm-series and --mysql-charm-bases-index must be given together"
         )
     # Note: Update defaults whenever charmcraft.yaml is changed