From 4c2931558044b9eb8238f2e8fe139049839c1ac0 Mon Sep 17 00:00:00 2001 From: livepeer-docker Date: Fri, 8 Sep 2023 10:55:23 -0700 Subject: [PATCH 1/4] [AUTO-COMMIT] Update `manifest.yaml` Files changed: M manifest.yaml --- manifest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.yaml b/manifest.yaml index 5fa6bcf10..c9474ca0e 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -26,7 +26,7 @@ box: strategy: download: bucket project: catalyst-api - commit: 2632451b49a2c3aeedae2074ecd8af6784e952e3 + commit: 79b04eefa7dcc268c33f610ad3c8faafae3a454b release: main srcFilenames: darwin-amd64: livepeer-catalyst-api-darwin-amd64.tar.gz @@ -49,7 +49,7 @@ box: strategy: download: bucket project: go-livepeer - commit: 40207bab72522758928bb67b5848222aaf51ddf7 + commit: eb2463fef35af9d33662ea85d5c54853d635d6c4 binary: livepeer release: master archivePath: livepeer From f965d9c619750f3d3ee0472a8a9e666b644d461a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Leszko?= Date: Thu, 22 Aug 2024 10:05:08 +0200 Subject: [PATCH 2/4] Revert go-livepeer version update --- manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yaml b/manifest.yaml index c9474ca0e..ad87129b6 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -49,7 +49,7 @@ box: strategy: download: bucket project: go-livepeer - commit: eb2463fef35af9d33662ea85d5c54853d635d6c4 + commit: 40207bab72522758928bb67b5848222aaf51ddf7 binary: livepeer release: master archivePath: livepeer From b7a2be30ad861f6b4d60541b60d1773df5d3bc14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Leszko?= Date: Thu, 22 Aug 2024 10:05:53 +0200 Subject: [PATCH 3/4] Fix E2E Tests --- test/e2e/mist_config.go | 48 ++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/test/e2e/mist_config.go b/test/e2e/mist_config.go index d4f217527..6ab283a4d 100644 --- a/test/e2e/mist_config.go +++ b/test/e2e/mist_config.go @@ -98,10 +98,10 @@ type targetProfile struct { } type trigger struct { - Handler string `json:"handler"` - Sync bool `json:"sync"` - Default string `json:"default"` - Streams []string `json:"streams"` + Handler string `json:"handler,omitempty"` + Sync bool `json:"sync,omitempty"` + Default string `json:"default,omitempty"` + Streams []string `json:"streams,omitempty"` } type mistConfig struct { @@ -186,12 +186,10 @@ func defaultMistConfig(host, sourceOutput string) mistConfig { SidMode: "0", Trustedproxy: []string{}, Triggers: map[string][]trigger{ - "STREAM_SOURCE": { + "LIVE_TRACK_LIST": { { - Handler: "http://127.0.0.1:7878/STREAM_SOURCE", - Sync: true, - Default: "push://", - Streams: []string{}, + Handler: "http://127.0.0.1:7878/api/mist/trigger", + Sync: false, }, }, "PUSH_END": { @@ -200,12 +198,42 @@ func defaultMistConfig(host, sourceOutput string) mistConfig { Sync: false, }, }, - "RECORDING_END": { + "PUSH_OUT_START": { + { + Handler: "http://127.0.0.1:7878/api/mist/trigger", + Sync: true, + }, + }, + "PUSH_REWRITE": { + { + Handler: "http://127.0.0.1:7878/api/mist/trigger", + Sync: true, + }, + }, + "STREAM_BUFFER": { + { + Handler: "http://127.0.0.1:7878/api/mist/trigger", + Sync: false, + }, + }, + "STREAM_SOURCE": { + { + Handler: "http://127.0.0.1:7878/api/mist/trigger", + Sync: true, + }, + }, + "USER_END": { { Handler: "http://127.0.0.1:7878/api/mist/trigger", Sync: false, }, }, + "USER_NEW": { + { + Handler: "http://127.0.0.1:7878/api/mist/trigger", + Sync: true, + }, + }, }, }, Streams: map[string]stream{ From fa9ba28fca3ec0e0011e1f6394e5ad6adeb5f931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Leszko?= Date: Thu, 22 Aug 2024 10:28:10 +0200 Subject: [PATCH 4/4] Update manifest.yaml --- manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yaml b/manifest.yaml index ad87129b6..4002d7f42 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -26,7 +26,7 @@ box: strategy: download: bucket project: catalyst-api - commit: 79b04eefa7dcc268c33f610ad3c8faafae3a454b + commit: de17642bf4a0d7cf1bccd3b3b88c747322212fd0 release: main srcFilenames: darwin-amd64: livepeer-catalyst-api-darwin-amd64.tar.gz