Skip to content

Commit

Permalink
[MM-61426] Bump to pion v4 (#928)
Browse files Browse the repository at this point in the history
* Bump to pion v4

* Bump rtcd

* Update rtcd

* Fix rtcd, improve logs

* Update snapshots

* Test dev images

* Use single host

* Fix networking

* Simplify

* Fix command

* Real fix

* Fix URL

* Update rtcd

* Update rtcd

* Test new transcriber build

* Bump images

* Bump offloader
  • Loading branch information
streamer45 authored Jan 7, 2025
1 parent 722ad77 commit 14fa6dc
Show file tree
Hide file tree
Showing 16 changed files with 149 additions and 270 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ jobs:
CONTAINER_PROXY: playwright_tests_proxy
CONTAINER_RTCD: playwright_tests_rtcd
CONTAINER_OFFLOADER: playwright_tests_offloader
IMAGE_CALLS_OFFLOADER: mattermost/calls-offloader:v0.8.0
IMAGE_CALLS_RECORDER: mattermost/calls-recorder:v0.7.7
IMAGE_CALLS_TRANSCRIBER: mattermost/calls-transcriber:v0.5.0
IMAGE_CALLS_OFFLOADER: mattermost/calls-offloader:v0.9.0
IMAGE_CALLS_RECORDER: mattermost/calls-recorder:v0.8.0
IMAGE_CALLS_TRANSCRIBER: mattermost/calls-transcriber:v0.6.0
IMAGE_SERVER: mattermostdevelopment/mattermost-enterprise-edition:master
IMAGE_CURL: curlimages/curl:8.7.1
CI_NODE_INDEX: ${{ matrix.run_id }}
Expand Down
3 changes: 2 additions & 1 deletion e2e/config-patch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"PluginSettings": {
"Plugins": {
"com.mattermost.calls": {
"enablerecordings": true
"enablerecordings": true,
"rtcdserviceurl": "http://rtcd:8045"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions e2e/scripts/prepare-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ docker run -d --quiet --name "${CONTAINER_RTCD}" \
--network-alias=rtcd "rtcd:e2e"

# Check that rtcd is up and ready
docker run --rm --quiet --name "${COMPOSE_PROJECT_NAME}_curl_rtcd" --net ${DOCKER_NETWORK} ${IMAGE_CURL} sh -c "until curl -fs http://rtcd:8045/version; do echo Waiting for rtcd; sleep 5; done; echo rtcd is up"
timeout --foreground 90s bash -c "until docker run --rm --quiet --name ${COMPOSE_PROJECT_NAME}_curl_rtcd --net ${DOCKER_NETWORK} ${IMAGE_CURL} curl -fs http://rtcd:8045/version; do echo Waiting for rtcd; sleep 2; done; echo rtcd is up"

echo "Spawning calls-offloader service with docker host access ..."
# Spawn calls offloader image as root to access local docker socket
Expand All @@ -76,7 +76,6 @@ echo "MM_LICENSE=${MM_PLUGIN_CALLS_TEST_LICENSE}" >>${WORKSPACE}/dotenv/app.priv
echo "MM_FEATUREFLAGS_BoardsProduct=true" >>${WORKSPACE}/dotenv/app.private.env
echo "MM_SERVICEENVIRONMENT=test" >>${WORKSPACE}/dotenv/app.private.env
echo "MM_CALLS_JOB_SERVICE_URL=http://calls-offloader:4545" >>${WORKSPACE}/dotenv/app.private.env
echo "MM_CALLS_RTCD_SERVICE_URL=http://rtcd:8045" >>${WORKSPACE}/dotenv/app.private.env
echo "MM_CONFIG=postgres://mmuser:mostest@postgres/mattermost_test?sslmode=disable&connect_timeout=10&binary_parameters=yes" >>${WORKSPACE}/dotenv/app.private.env
echo "MM_SERVICESETTINGS_SITEURL=http://mm-server:8065" >>${WORKSPACE}/dotenv/app.private.env
echo "MM_SERVICESETTINGS_ENABLELOCALMODE=true" >>${WORKSPACE}/dotenv/app.private.env
Expand Down
6 changes: 6 additions & 0 deletions e2e/scripts/run-core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ docker cp playwright-e2e-core:/usr/src/calls-e2e/test-results results/test-resul
docker cp playwright-e2e-core:/usr/src/calls-e2e/playwright-report results/playwright-report-core-${CI_NODE_INDEX}
docker cp playwright-e2e-core:/usr/src/calls-e2e/pw-results.json results/pw-results-core-${CI_NODE_INDEX}.json

## Dumping services logs to be uploaded as artifacts in case of failures.
docker logs ${CONTAINER_SERVER}1 >"${WORKSPACE}/logs/server1_core.log"
docker logs ${CONTAINER_SERVER}2 >"${WORKSPACE}/logs/server2_core.log"
docker logs ${CONTAINER_PROXY} >"${WORKSPACE}/logs/proxy_core.log"
docker logs ${CONTAINER_OFFLOADER} >"${WORKSPACE}/logs/offloader_core.log"

## Check if we have an early failures in order to upload logs
NUM_FAILURES=0
NUM_FAILURES=$((NUM_FAILURES + $(jq '.suites[].suites[].specs[].tests[] | last(.results[]) | select(.status != "passed").status' <"${WORKSPACE}/results/pw-results-core-${RUN_ID}.json" | wc -l)))
Expand Down
2 changes: 1 addition & 1 deletion e2e/scripts/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ docker cp e2e/config-patch.json ${CONTAINER_SERVER}1:/mattermost
echo "Installing calls ..."
docker exec \
${CONTAINER_SERVER}1 \
sh -c "/mattermost/bin/mmctl plugin add bin/calls && sleep 2"
sh -c "/mattermost/bin/mmctl plugin add bin/calls && sleep 5"

# Patch config
echo "Patching calls config ..."
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 22 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ module github.com/mattermost/mattermost-plugin-calls
go 1.22.7

require (
github.com/pion/ice/v2 v2.3.25 // indirect
github.com/pion/rtcp v1.2.14 // indirect
github.com/pion/webrtc/v3 v3.2.42 // indirect
github.com/pion/rtcp v1.2.15 // indirect
github.com/prometheus/client_golang v1.16.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
)

require (
Expand All @@ -24,7 +22,7 @@ require (
github.com/mattermost/mattermost-plugin-calls/server/public v0.0.3
github.com/mattermost/mattermost/server/public v0.1.9
github.com/mattermost/morph v1.1.0
github.com/mattermost/rtcd v0.18.1-0.20241122194949-fc76bf6a2f16
github.com/mattermost/rtcd v0.18.1-0.20250107081358-290c5ce0a692
github.com/mattermost/squirrel v0.2.0
github.com/pkg/errors v0.9.1
github.com/rudderlabs/analytics-go v3.3.3+incompatible
Expand All @@ -35,7 +33,7 @@ require (
gopkg.in/yaml.v3 v3.0.1
)

replace github.com/pion/interceptor v0.1.29 => github.com/streamer45/interceptor v0.0.0-20240411210059-c7d42d2dafc1
replace github.com/pion/interceptor v0.1.37 => github.com/streamer45/interceptor v0.0.0-20250106110758-7e0fb613abef

replace github.com/mattermost/mattermost-plugin-calls/server/public => ./server/public

Expand Down Expand Up @@ -101,19 +99,21 @@ require (
github.com/pborman/uuid v1.2.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
github.com/pion/datachannel v1.5.6 // indirect
github.com/pion/dtls/v2 v2.2.11 // indirect
github.com/pion/interceptor v0.1.29 // indirect
github.com/pion/datachannel v1.5.10 // indirect
github.com/pion/dtls/v3 v3.0.4 // indirect
github.com/pion/ice/v4 v4.0.3 // indirect
github.com/pion/interceptor v0.1.37 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.12 // indirect
github.com/pion/mdns/v2 v2.0.7 // indirect
github.com/pion/randutil v0.1.0 // indirect
github.com/pion/rtp v1.8.6 // indirect
github.com/pion/sctp v1.8.16 // indirect
github.com/pion/rtp v1.8.10 // indirect
github.com/pion/sctp v1.8.35 // indirect
github.com/pion/sdp/v3 v3.0.9 // indirect
github.com/pion/srtp/v2 v2.0.18 // indirect
github.com/pion/stun v0.6.1 // indirect
github.com/pion/transport/v2 v2.2.5 // indirect
github.com/pion/turn/v2 v2.1.6 // indirect
github.com/pion/srtp/v3 v3.0.4 // indirect
github.com/pion/stun/v3 v3.0.0 // indirect
github.com/pion/transport/v3 v3.0.7 // indirect
github.com/pion/turn/v4 v4.0.0 // indirect
github.com/pion/webrtc/v4 v4.0.7 // indirect
github.com/plar/go-adaptive-radix-tree v1.0.4 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
Expand All @@ -136,6 +136,7 @@ require (
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/wiggin77/merror v1.0.5 // indirect
github.com/wiggin77/srslog v1.0.1 // indirect
github.com/wlynxg/anet v0.0.5 // indirect
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
Expand All @@ -144,13 +145,13 @@ require (
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240805194559-2c9e96a0b5d4 // indirect
Expand Down
Loading

0 comments on commit 14fa6dc

Please sign in to comment.