[DPE-8550] Check juju version before removing revision and remove discourse charmers test (#1151)

* Check juju version before removing revision

* Update redis series/bases

* Use spread to collect tests

* Install spread

* Indico redis

* Remove db admin test

* Switch to common spread collection

Author: dragomirp

.github/workflows/integration_test.yaml

@@ -19,19 +19,24 @@ jobs:
         uses: actions/checkout@v5
       - name: Set up environment
         run: |
-          sudo snap install charmcraft --classic
+          sudo snap install go --classic
+          go install github.com/snapcore/spread/cmd/spread@latest
           pipx install tox poetry
       - name: Collect spread jobs
         id: collect-jobs
         shell: python
         run: |
           import json
+          import pathlib
           import os
           import subprocess
 
           spread_jobs = (
               subprocess.run(
-                  ["charmcraft", "test", "--list", "github-ci"], capture_output=True, check=True, text=True
+                  [pathlib.Path.home() / "go/bin/spread", "-list", "github-ci"],
+                  capture_output=True,
+                  check=True,
+                  text=True,
               )
               .stdout.strip()
               .split("\n")

src/charm.py

@@ -62,7 +62,7 @@
 from lightkube.models.core_v1 import ServicePort, ServiceSpec
 from lightkube.models.meta_v1 import ObjectMeta
 from lightkube.resources.core_v1 import Endpoints, Node, Pod, Service
-from ops import main
+from ops import JujuVersion, main
 from ops.charm import (
     ActionEvent,
     HookEvent,
@@ -1365,6 +1365,12 @@ def promote_primary_unit(self, event: ActionEvent) -> None:
                 event.fail("Switchover failed or timed out, check the logs for details")
 
     def _on_secret_remove(self, event: SecretRemoveEvent) -> None:
+        if self.model.juju_version < JujuVersion("3.6.11"):
+            logger.warning(
+                "Skipping secret revision removal due to https://github.com/juju/juju/issues/20782"
+            )
+            return
+
         # A secret removal (entire removal, not just a revision removal) causes
         # https://github.com/juju/juju/issues/20794. This check is to avoid the
         # errors that would happen if we tried to remove the revision in that case

tests/integration/new_relations/test_new_relations_1.py

@@ -27,7 +27,6 @@
 ANOTHER_DATABASE_APP_NAME = "another-database"
 DATA_INTEGRATOR_APP_NAME = "data-integrator"
 DISCOURSE_APP_NAME = "discourse-k8s"
-REDIS_APP_NAME = "redis-k8s"
 APP_NAMES = [APPLICATION_APP_NAME, DATABASE_APP_NAME, ANOTHER_DATABASE_APP_NAME]
 DATABASE_APP_METADATA = yaml.safe_load(Path("./metadata.yaml").read_text())
 FIRST_DATABASE_RELATION_NAME = "database"

tests/integration/new_relations/test_new_relations_2.py

@@ -69,7 +69,7 @@ async def test_discourse(ops_test: OpsTest):
     await gather(
         ops_test.model.deploy(DISCOURSE_APP_NAME, application_name=DISCOURSE_APP_NAME),
         ops_test.model.deploy(
-            REDIS_APP_NAME, application_name=REDIS_APP_NAME, channel="latest/edge", base=CHARM_BASE
+            REDIS_APP_NAME, application_name=REDIS_APP_NAME, channel="latest/edge", series="jammy"
         ),
     )
 
@@ -151,10 +151,10 @@ async def test_indico_datatabase(ops_test: OpsTest) -> None:
             series="focal",
         )
         await ops_test.model.deploy(
-            "redis-k8s", channel="stable", application_name="redis-broker", base="ubuntu@20.04"
+            REDIS_APP_NAME, application_name="redis-broker", channel="latest/edge", series="jammy"
         )
         await ops_test.model.deploy(
-            "redis-k8s", channel="stable", application_name="redis-cache", base="ubuntu@20.04"
+            REDIS_APP_NAME, application_name="redis-cache", channel="latest/edge", series="jammy"
         )
         await asyncio.gather(
             ops_test.model.relate("redis-broker", "indico:redis-broker"),

tests/integration/test_db_admin.py

@@ -11,6 +11,7 @@
 from charms.postgresql_k8s.v0.postgresql import PostgreSQLUpdateUserPasswordError
 from lightkube import ApiError
 from lightkube.resources.core_v1 import Endpoints, Pod, Service
+from ops import JujuVersion
 from ops.model import (
     ActiveStatus,
     BlockedStatus,
@@ -1905,13 +1906,25 @@ def test_get_ldap_parameters(harness):
         _get_relation_data.reset_mock()
 
 
-def test_on_secret_remove(harness):
-    event = Mock()
-    harness.charm._on_secret_remove(event)
-    event.remove_revision.assert_called_once_with()
-    event.reset_mock()
+def test_on_secret_remove(harness, only_with_juju_secrets):
+    with (
+        patch("ops.model.Model.juju_version", new_callable=PropertyMock) as _juju_version,
+    ):
+        event = Mock()
 
-    # No secret
-    event.secret.label = None
-    harness.charm._on_secret_remove(event)
-    assert not event.remove_revision.called
+        # New juju
+        _juju_version.return_value = JujuVersion("3.6.11")
+        harness.charm._on_secret_remove(event)
+        event.remove_revision.assert_called_once_with()
+        event.reset_mock()
+
+        # Old juju
+        _juju_version.return_value = JujuVersion("3.6.9")
+        harness.charm._on_secret_remove(event)
+        assert not event.remove_revision.called
+        event.reset_mock()
+
+        # No secret
+        event.secret.label = None
+        harness.charm._on_secret_remove(event)
+        assert not event.remove_revision.called