PLT-4550 move webrtc to TE (#4440)
* PLT-4550 move webrtc to TE * remove webrtc from makefile enterprise tests
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
6289c72686
Коммит
772b57386f
21
Makefile
21
Makefile
@@ -77,6 +77,14 @@ start-docker:
|
||||
docker start mattermost-postgres > /dev/null; \
|
||||
fi
|
||||
|
||||
@if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 0 ]; then \
|
||||
echo starting mattermost-webrtc; \
|
||||
docker run --name mattermost-webrtc -p 7088:7088 -p 7089:7089 -p 8188:8188 -p 8189:8189 -d mattermost/webrtc:latest > /dev/null; \
|
||||
elif [ $(shell docker ps | grep -ci mattermost-webrtc) -eq 0 ]; then \
|
||||
echo restarting mattermost-webrtc; \
|
||||
docker start mattermost-webrtc > /dev/null; \
|
||||
fi
|
||||
|
||||
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||
@echo Ldap test user test.one
|
||||
@if [ $(shell docker ps -a | grep -ci mattermost-openldap) -eq 0 ]; then \
|
||||
@@ -99,14 +107,6 @@ ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||
docker start mattermost-openldap > /dev/null; \
|
||||
sleep 10; \
|
||||
fi
|
||||
|
||||
@if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 0 ]; then \
|
||||
echo starting mattermost-webrtc; \
|
||||
docker run --name mattermost-webrtc -p 7088:7088 -p 7089:7089 -p 8188:8188 -p 8189:8189 -d mattermost/webrtc:latest > /dev/null; \
|
||||
elif [ $(shell docker ps | grep -ci mattermost-webrtc) -eq 0 ]; then \
|
||||
echo restarting mattermost-webrtc; \
|
||||
docker start mattermost-webrtc > /dev/null; \
|
||||
fi
|
||||
endif
|
||||
|
||||
stop-docker:
|
||||
@@ -209,7 +209,6 @@ ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||
$(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/saml && ./saml.test -test.v -test.timeout=60s -test.coverprofile=csaml.out || exit 1
|
||||
$(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/cluster && ./cluster.test -test.v -test.timeout=60s -test.coverprofile=ccluster.out || exit 1
|
||||
$(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/account_migration && ./account_migration.test -test.v -test.timeout=60s -test.coverprofile=caccount_migration.out || exit 1
|
||||
$(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/webrtc && ./webrtc.test -test.v -test.timeout=60s -test.coverprofile=cwebrtc.out || exit 1
|
||||
|
||||
tail -n +2 cldap.out >> ecover.out
|
||||
tail -n +2 ccompliance.out >> ecover.out
|
||||
@@ -218,8 +217,7 @@ ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||
tail -n +2 csaml.out >> ecover.out
|
||||
tail -n +2 ccluster.out >> ecover.out
|
||||
tail -n +2 caccount_migration.out >> ecover.out
|
||||
tail -n +2 cwebrtc.out >> ecover.out
|
||||
rm -f cldap.out ccompliance.out cmfa.out cemoji.out csaml.out ccluster.out caccount_migration.out cwebrtc.out
|
||||
rm -f cldap.out ccompliance.out cmfa.out cemoji.out csaml.out ccluster.out caccount_migration.out
|
||||
rm -r ldap.test
|
||||
rm -r compliance.test
|
||||
rm -r mfa.test
|
||||
@@ -227,7 +225,6 @@ ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||
rm -r saml.test
|
||||
rm -r cluster.test
|
||||
rm -r account_migration.test
|
||||
rm -r webrtc.test
|
||||
rm -f config/*.crt
|
||||
rm -f config/*.key
|
||||
endif
|
||||
|
||||
Ссылка в новой задаче
Block a user