From 662f9994bb90c7bed49d31a3e2bc74e7c1cf163a Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 28 Mar 2024 10:24:20 +0100 Subject: [PATCH] bw: fix tests --- bundlewrap/bundles/crs-worker/metadata.py | 2 ++ bundlewrap/bundles/pygtk-atem-switcher/items.py | 2 +- bundlewrap/nodes/encoder80.toml | 1 + bundlewrap/nodes/encoder81.toml | 3 ++- bundlewrap/nodes/encoder98.toml | 3 +++ bundlewrap/nodes/minion80.toml | 1 + bundlewrap/nodes/minion81.toml | 1 + bundlewrap/nodes/mixer23.toml | 1 + bundlewrap/nodes/mixer80.toml | 1 + bundlewrap/nodes/mixer81.toml | 1 + 10 files changed, 14 insertions(+), 2 deletions(-) diff --git a/bundlewrap/bundles/crs-worker/metadata.py b/bundlewrap/bundles/crs-worker/metadata.py index f3e866bf2..25775a290 100644 --- a/bundlewrap/bundles/crs-worker/metadata.py +++ b/bundlewrap/bundles/crs-worker/metadata.py @@ -35,6 +35,8 @@ 'crs-worker/secrets/meta', ) def derive_secrets_from_encoding(metadata): + if node.dummy: + raise DoNotRunAgain return { 'crs-worker': { 'secrets': { diff --git a/bundlewrap/bundles/pygtk-atem-switcher/items.py b/bundlewrap/bundles/pygtk-atem-switcher/items.py index 2820ef4f8..6c1460a99 100644 --- a/bundlewrap/bundles/pygtk-atem-switcher/items.py +++ b/bundlewrap/bundles/pygtk-atem-switcher/items.py @@ -27,7 +27,7 @@ } files['/opt/pygtk-atem-switcher/config.toml'] = { - 'content': repo.libs.faults.dict_as_toml(node.metadata.get('pygtk-atem-switcher')-, + 'content': repo.libs.faults.dict_as_toml(node.metadata.get('pygtk-atem-switcher')), 'triggers': { 'svc_systemd:pygtk-atem-switcher:restart', } diff --git a/bundlewrap/nodes/encoder80.toml b/bundlewrap/nodes/encoder80.toml index e69de29bb..8529f593a 100644 --- a/bundlewrap/nodes/encoder80.toml +++ b/bundlewrap/nodes/encoder80.toml @@ -0,0 +1 @@ +dummy = true diff --git a/bundlewrap/nodes/encoder81.toml b/bundlewrap/nodes/encoder81.toml index 5a8f12541..16e1b20b0 100644 --- a/bundlewrap/nodes/encoder81.toml +++ b/bundlewrap/nodes/encoder81.toml @@ -21,7 +21,8 @@ dhcp = true high_dpi = true [metadata.voctocore] -streaming_endpoint = "!kee_pass:ansible|stream-api|encoders|hacc" +streaming_endpoint = "hacc" +streaming_auth_key = "!decrypt:encrypt$gAAAAABmBTUmTYXkCzR1bpxUd5VmNevZYF8EA9GFoZOY3CJ-q3AT2Cb1i4HOj51a8Wpln5IGtgMvqcitdspJJPTJDvq9v0w3PgajUsGvSeZ3LxdjlYqg234=" [metadata.voctocore.sources.cam1] devicenumber = "4" diff --git a/bundlewrap/nodes/encoder98.toml b/bundlewrap/nodes/encoder98.toml index cf7633b1d..328361c6f 100644 --- a/bundlewrap/nodes/encoder98.toml +++ b/bundlewrap/nodes/encoder98.toml @@ -12,6 +12,9 @@ room_name = "Saal 98" ips = ["10.73.98.3/16"] gateway4 = "10.73.0.254" +[metadata.voctocore] +streaming_auth_key = "" # TODO + [metadata.voctocore.sources.cam1] devicenumber = 0 mode = "1080p25" diff --git a/bundlewrap/nodes/minion80.toml b/bundlewrap/nodes/minion80.toml index e69de29bb..8529f593a 100644 --- a/bundlewrap/nodes/minion80.toml +++ b/bundlewrap/nodes/minion80.toml @@ -0,0 +1 @@ +dummy = true diff --git a/bundlewrap/nodes/minion81.toml b/bundlewrap/nodes/minion81.toml index e69de29bb..8529f593a 100644 --- a/bundlewrap/nodes/minion81.toml +++ b/bundlewrap/nodes/minion81.toml @@ -0,0 +1 @@ +dummy = true diff --git a/bundlewrap/nodes/mixer23.toml b/bundlewrap/nodes/mixer23.toml index d32ce6cb3..cf9a017f0 100644 --- a/bundlewrap/nodes/mixer23.toml +++ b/bundlewrap/nodes/mixer23.toml @@ -1 +1,2 @@ # does not exist, just a dummy +dummy = true diff --git a/bundlewrap/nodes/mixer80.toml b/bundlewrap/nodes/mixer80.toml index e69de29bb..8529f593a 100644 --- a/bundlewrap/nodes/mixer80.toml +++ b/bundlewrap/nodes/mixer80.toml @@ -0,0 +1 @@ +dummy = true diff --git a/bundlewrap/nodes/mixer81.toml b/bundlewrap/nodes/mixer81.toml index e69de29bb..8529f593a 100644 --- a/bundlewrap/nodes/mixer81.toml +++ b/bundlewrap/nodes/mixer81.toml @@ -0,0 +1 @@ +dummy = true