Fixes to pass the CI problems regarding missing postgresql charm. (#847)

Author: juanmanuel-tirado

tests/integration/test_charmhub.py

@@ -103,5 +103,5 @@ async def test_subordinate_charm_zero_units(event_loop):
 @pytest.mark.asyncio
 async def test_list_resources(event_loop):
     async with base.CleanModel() as model:
-        resources = await model.charmhub.list_resources('postgresql')
+        resources = await model.charmhub.list_resources('hello-kubecon')
         assert type(resources) == list and len(resources) > 0

tests/integration/test_model.py

@@ -193,9 +193,10 @@ async def test_wait_local_charm_waiting_timeout(event_loop):
 @pytest.mark.asyncio
 async def test_deploy_bundle(event_loop):
     async with base.CleanModel() as model:
-        await model.deploy('canonical-livepatch-onprem', channel='edge', trust=True)
+        await model.deploy('anbox-cloud-core', channel='stable',
+                           trust=True)
 
-        for app in ('haproxy', 'livepatch', 'postgresql', 'ubuntu-advantage'):
+        for app in ('ams', 'etcd', 'ams-node-controller', 'etcd-ca', 'lxd'):
             assert app in model.applications
 
 
@@ -281,10 +282,11 @@ async def test_deploy_local_charm_folder_symlink(event_loop):
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_deploy_trusted_bundle(event_loop):
+    pytest.skip("skip until we have a deployable bundle available. Right now the landscape-dense fails because postgresql is broken")
     async with base.CleanModel() as model:
-        await model.deploy('canonical-livepatch-onprem', channel='stable', trust=True)
+        await model.deploy('landscape-dense', channel='stable', trust=True)
 
-        for app in ('haproxy', 'livepatch', 'postgresql', 'ubuntu-advantage'):
+        for app in ('haproxy', 'landscape-server', 'postgresql', 'rabbit-mq-server'):
             assert app in model.applications
 
         haproxy_app = model.applications['haproxy']