Skip to content

Commit 9b05028

Browse files
authored
Use CloudCDN urls instead of bucket access. (#299)
Fix `go.sum` file versioning errors
1 parent 38c7734 commit 9b05028

File tree

7 files changed

+13
-1028
lines changed

7 files changed

+13
-1028
lines changed

Makefile

-4
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ docker:
5050
push:
5151
docker push livepeer/streamtester:latest
5252

53-
.PHONY: localdocker
54-
localdocker:
55-
docker build -f docker/Dockerfile.debian -t livepeer/streamtester:latest --build-arg version=$(shell git describe --dirty) .
56-
5753
.PHONY: release
5854
release:
5955
@if [[ ! "$(version)" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$$ ]]; then \

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ Automatically built binaries can be found on
2323

2424
## Video test files
2525

26-
- [official_test_source_2s_keys_24pfs.mp4](https://storage.googleapis.com/lp_testharness_assets/official_test_source_2s_keys_24pfs.mp4)
26+
- [official_test_source_2s_keys_24pfs.mp4](https://test-harness-gcp.livepeer.fish/official_test_source_2s_keys_24pfs.mp4)
2727

28-
- [official_test_source_2s_keys_24pfs_3min.mp4](https://storage.googleapis.com/lp_testharness_assets/official_test_source_2s_keys_24pfs_3min.mp4)
28+
- [official_test_source_2s_keys_24pfs_3min.mp4](https://test-harness-gcp.livepeer.fish/official_test_source_2s_keys_24pfs_3min.mp4)
2929

30-
- [bbb_sunflower_1080p_30fps_normal_t02.mp4](https://storage.googleapis.com/lp_testharness_assets/bbb_sunflower_1080p_30fps_normal_t02.mp4)
30+
- [bbb_sunflower_1080p_30fps_normal_t02.mp4](https://test-harness-gcp.livepeer.fish/bbb_sunflower_1080p_30fps_normal_t02.mp4)
3131

32-
- [bbb_sunflower_1080p_30fps_normal_2min.mp4](https://storage.googleapis.com/lp_testharness_assets/bbb_sunflower_1080p_30fps_normal_2min.mp4)
32+
- [bbb_sunflower_1080p_30fps_normal_2min.mp4](https://test-harness-gcp.livepeer.fish/bbb_sunflower_1080p_30fps_normal_2min.mp4)
3333

3434
## Command line
3535

3636
If name of the file to stream is not specified, then default one -
3737
`official_test_source_2s_keys_24pfs.mp4` is used. It should be placed
3838
in the same directory as Stream Tester. Can be downloaded from
39-
[here](https://storage.googleapis.com/lp_testharness_assets/official_test_source_2s_keys_24pfs.mp4).
39+
[here](https://test-harness-gcp.livepeer.fish/official_test_source_2s_keys_24pfs.mp4).
4040

4141
All options can be put into config file and used like
4242

cmd/recordtester/recordtester.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func main() {
162162
ingestStr := fs.String("ingest", "", "Ingest server info in JSON format including ingest and playback URLs. Should follow Livepeer API schema")
163163
analyzerServers := fs.String("analyzer-servers", "", "Comma-separated list of base URLs to connect for the Stream Health Analyzer API (defaults to --api-server)")
164164
fileArg := fs.String("file", "bbb_sunflower_1080p_30fps_normal_t02.mp4", "File to stream")
165-
vodImportUrl := fs.String("vod-import-url", "https://storage.googleapis.com/lp_testharness_assets/bbb_sunflower_1080p_30fps_normal_2min.mp4", "URL for VOD import")
165+
vodImportUrl := fs.String("vod-import-url", "https://test-harness-gcp.livepeer.fish/bbb_sunflower_1080p_30fps_normal_2min.mp4", "URL for VOD import")
166166
continuousTest := fs.Duration("continuous-test", 0, "Do continuous testing")
167167
useHttp := fs.Bool("http", false, "Do HTTP tests instead of RTMP")
168168
forceRecordingUrl := fs.Bool("force-recording-url", false, "Whether to force the API to return a recording URL (skip the user session timeout)")

docker/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
# stream-tester
12
FROM golang:1.19-alpine3.15 as builder
23

34
RUN apk add --no-cache make gcc musl-dev linux-headers git \
45
pkgconfig gnutls-dev ffmpeg-dev build-base parallel
56

67
WORKDIR /root
78

8-
RUN parallel wget https://storage.googleapis.com/lp_testharness_assets/{} ::: official_test_source_2s_keys_24pfs.mp4 official_test_source_2s_keys_24pfs_3min.mp4 bbb_sunflower_1080p_30fps_normal_t02.mp4 bbb_sunflower_1080p_30fps_normal_2min.mp4 official_test_source_2s_keys_24pfs_30s.mp4 && \
9-
wget -qO- https://storage.googleapis.com/lp_testharness_assets/official_test_source_2s_keys_24pfs_30s_hls.tar.gz | tar xvz -C .
9+
RUN parallel wget https://test-harness-gcp.livepeer.fish/{} ::: official_test_source_2s_keys_24pfs.mp4 official_test_source_2s_keys_24pfs_3min.mp4 bbb_sunflower_1080p_30fps_normal_t02.mp4 bbb_sunflower_1080p_30fps_normal_2min.mp4 official_test_source_2s_keys_24pfs_30s.mp4 && \
10+
wget -qO- https://test-harness-gcp.livepeer.fish/official_test_source_2s_keys_24pfs_30s_hls.tar.gz | tar xvz -C .
1011

1112
COPY go.mod go.sum ./
1213

docker/Dockerfile.debian

-41
This file was deleted.

docker/Dockerfile.orch-tester

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt update \
99

1010
WORKDIR /root
1111

12-
RUN wget -qO- https://storage.googleapis.com/lp_testharness_assets/official_test_source_2s_keys_24pfs_30s_hls.tar.gz | tar xvz -C . && go version
12+
RUN wget -qO- https://test-harness-gcp.livepeer.fish/official_test_source_2s_keys_24pfs_30s_hls.tar.gz | tar xvz -C . && go version
1313

1414
COPY go.mod go.sum ./
1515

0 commit comments

Comments
 (0)