deploy self-signed-certificates with juju command

Author: carlcsaposs-canonical

tests/integration/test_data_integrator.py

@@ -58,8 +58,14 @@ async def test_external_connectivity_with_data_integrator(
                 num_units=None,
                 series=series,
             ),
-            ops_test.model.deploy(
-                tls_app_name, application_name=tls_app_name, channel=tls_channel, config=tls_config
+            # s390x not available on latest edge release so libjuju fails to deploy it
+            ops_test.juju(
+                "deploy",
+                tls_app_name,
+                "--channel",
+                tls_channel,
+                "--config",
+                "ca-common-name='Test CA'",
             ),
             ops_test.model.deploy(
                 DATA_INTEGRATOR_APP_NAME,

tests/integration/test_exporter_with_tls.py

@@ -133,12 +133,14 @@ async def test_exporter_endpoint(ops_test: OpsTest, charm, series) -> None:
     )
 
     logger.info(f"Deploying {tls_app_name}")
-    await ops_test.model.deploy(
+    # s390x not available on latest edge release so libjuju fails to deploy it
+    await ops_test.juju(
+        "deploy",
         tls_app_name,
-        application_name=tls_app_name,
-        channel=tls_channel,
-        config=tls_config,
-        series="jammy",
+        "--channel",
+        tls_channel,
+        "--config",
+        "ca-common-name='Test CA'",
     )
     await ops_test.model.wait_for_idle([tls_app_name], status="active", timeout=SLOW_TIMEOUT)
 

tests/integration/test_hacluster.py

@@ -262,11 +262,14 @@ async def test_tls_along_with_ha_cluster(ops_test: OpsTest, series) -> None:
     """Ensure that mysqlrouter is externally accessible with TLS integration."""
     logger.info("Deploying TLS")
     async with ops_test.fast_forward("60s"):
-        await ops_test.model.deploy(
+        # s390x not available on latest edge release so libjuju fails to deploy it
+        await ops_test.juju(
+            "deploy",
             tls_app_name,
-            application_name=tls_app_name,
-            channel=tls_channel,
-            config=tls_config,
+            "--channel",
+            tls_channel,
+            "--config",
+            "ca-common-name='Test CA'",
         )
 
     logger.info("Ensure auto-generated TLS cert before relation with TLS")

tests/integration/test_tls.py

@@ -56,12 +56,14 @@ async def test_build_deploy_and_relate(ops_test: OpsTest, charm, series) -> None
                 num_units=None,
                 series=series,
             ),
-            ops_test.model.deploy(
+            # s390x not available on latest edge release so libjuju fails to deploy it
+            ops_test.juju(
+                "deploy",
                 tls_app_name,
-                application_name=tls_app_name,
-                channel=tls_channel,
-                config=tls_config,
-                series="jammy",
+                "--channel",
+                tls_channel,
+                "--config",
+                "ca-common-name='Test CA'",
             ),
             ops_test.model.deploy(
                 TEST_APP_NAME,