Merge branch 'main' into renovate/python-dependencies

canonical · Oct 6, 2023 · b1829e4 · b1829e4
2 parents 0a0e9fc + 51e4177
commit b1829e4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -75,7 +75,6 @@ jobs:
         tox-environments:
           - backup-integration
           - charm-integration
-          - database-relation-integration
           - db-relation-integration
           - ha-replication-integration
           - ha-self-healing-integration
@@ -89,6 +88,12 @@ jobs:
         free-disk-space:
           - false
         include:
+          - tox-environments: database-relation-integration
+            agent-versions: "2.9.44"  # renovate: latest juju 2
+            free-disk-space: true
+          - tox-environments: database-relation-integration
+            agent-versions: "3.1.5"  # renovate: latest juju 3
+            free-disk-space: true
           - tox-environments: db-admin-relation-integration
             agent-versions: "2.9.44"  # renovate: latest juju 2
             free-disk-space: true

diff --git a/src/constants.py b/src/constants.py
@@ -32,7 +32,7 @@
 # Snap constants.
 PGBACKREST_EXECUTABLE = "charmed-postgresql.pgbackrest"
 POSTGRESQL_SNAP_NAME = "charmed-postgresql"
-SNAP_PACKAGES = [(POSTGRESQL_SNAP_NAME, {"revision": "78"})]
+SNAP_PACKAGES = [(POSTGRESQL_SNAP_NAME, {"revision": "79"})]
 
 SNAP_COMMON_PATH = "/var/snap/charmed-postgresql/common"
 SNAP_CURRENT_PATH = "/var/snap/charmed-postgresql/current"

diff --git a/tests/integration/test_backups.py b/tests/integration/test_backups.py
@@ -40,7 +40,7 @@ async def test_backup(ops_test: OpsTest, cloud_configs: Tuple[Dict, Dict]) -> No
     # Deploy S3 Integrator and TLS Certificates Operator.
     await ops_test.model.deploy(S3_INTEGRATOR_APP_NAME)
     config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
-    await ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, config=config)
+    await ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, config=config, channel="legacy/stable")
 
     for cloud, config in cloud_configs[0].items():
         # Deploy and relate PostgreSQL to S3 integrator (one database app for each cloud for now

diff --git a/tests/integration/test_tls.py b/tests/integration/test_tls.py
@@ -53,7 +53,9 @@ async def test_tls_enabled(ops_test: OpsTest) -> None:
     async with ops_test.fast_forward():
         # Deploy TLS Certificates operator.
         config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
-        await ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, config=config)
+        await ops_test.model.deploy(
+            TLS_CERTIFICATES_APP_NAME, config=config, channel="legacy/stable"
+        )
 
         # Relate it to the PostgreSQL to enable TLS.
         await ops_test.model.relate(DATABASE_APP_NAME, TLS_CERTIFICATES_APP_NAME)