deps: add rust build dependencies to charm (#494)

canonical · Jul 13, 2023 · 770c5de · 770c5de
1 parent af36b01
commit 770c5de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 65 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -12,6 +12,8 @@ parts:
   charm:
     build-packages:
       - git
+    charm-binary-python-packages:
+      - jsonschema
     charm-python-packages:
       - wheel==0.37.1
       - setuptools==45.2.0

diff --git a/tests/integration/test_remote_write_grafana_agent.py b/tests/integration/test_remote_write_grafana_agent.py
@@ -54,13 +54,18 @@ async def test_remote_write_with_grafana_agent(
         ),
     )
 
-    await ops_test.model.wait_for_idle(apps=apps, status="active", wait_for_units=1)
+    await ops_test.model.wait_for_idle(apps=apps, wait_for_units=1)
     assert await check_prometheus_is_ready(ops_test, prometheus_name, 0)
 
     await asyncio.gather(
         ops_test.model.add_relation(
             f"{prometheus_name}:receive-remote-write", f"{agent_name}:send-remote-write"
         ),
+        # With a "remote-write" relation in place, grafana-agent will block without a matching
+        # "metrics-endpoint" relation, so relate back to prometheus just to get this covered.
+        ops_test.model.add_relation(
+            f"{prometheus_name}:self-metrics-endpoint", f"{agent_name}:metrics-endpoint"
+        ),
         ops_test.model.add_relation(
             f"{tester_name}:metrics-endpoint", f"{agent_name}:metrics-endpoint"
         ),