Revisit the secret backend integration test (#858)

* Revisit the secret backend integration test

Both changing the postgresql series to jammy (we should change all of
these to use --base at some point) as per
juju/juju#15616, and also increasing the
timeout appears to be turning this test from timeout to green in local
setup, we should see a similar effect on the CI as well.

* Revisit additional tests using postgresql charm

---------

Co-authored-by: Juan M. Tirado <juanmanuel-tirado@users.noreply.github.com>

Author: cderici

tests/integration/test_controller.py

@@ -248,13 +248,13 @@ async def test_secrets_backend_lifecycle(event_loop):
     async with base.CleanModel() as m:
         controller = await m.get_controller()
         # deploy postgresql
-        await m.deploy('postgresql', channel="latest/stable", series="focal")
+        await m.deploy('postgresql', base='ubuntu@22.04')
         # deploy vault
-        await m.deploy("vault", series="focal")
+        await m.deploy("vault", base='ubuntu@20.04')
         # relate/integrate
         await m.integrate("vault:db", "postgresql:db")
         # wait for the postgresql app
-        await m.wait_for_idle(["postgresql", "vault"], timeout=900)
+        await m.wait_for_idle(["postgresql", "vault"], timeout=1900)
         # expose vault
         vault_app = m.applications["vault"]
         await vault_app.expose()

tests/integration/test_model.py

@@ -354,8 +354,8 @@ async def test_deploy_from_ch_channel_revision_success(event_loop):
         # Ensure we're able to resolve charm these with channel and revision,
         # or channel without revision (note that revision requires channel,
         # but not vice versa)
-        await model.deploy("postgresql", application_name="test1", channel='latest/stable')
-        await model.deploy("postgresql", application_name="test2", channel='latest/stable', revision=290)
+        await model.deploy("postgresql", application_name="test1", channel='14/stable', base='ubuntu@22.04')
+        await model.deploy("postgresql", application_name="test2", channel='14/stable', revision=288)
 
 
 @base.bootstrapped
@@ -1308,7 +1308,7 @@ async def test_detach_storage(event_loop):
 @pytest.mark.asyncio
 async def test_add_and_list_storage(event_loop):
     async with base.CleanModel() as model:
-        app = await model.deploy('postgresql', channel="latest/stable")
+        app = await model.deploy('postgresql', base='ubuntu@22.04')
         await model.wait_for_idle(status="active", timeout=900)
         unit = app.units[0]
         await unit.add_storage("pgdata", size=512)