whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable Docker-based test servers on Linux temporarily 

To unlock dev branch, we need to disable the Docker-based test server on
Linux for short-term. With this change, we can force update the SHA-1 of
docker images in both qt5 and qtbase. During this transitional period,
the Linux platform should keep using the remote test server.

Change-Id: I4c07abf36154382e5d667ca733901b6d7fda9677
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
bb10
Ryan Chu 2018-12-03 11:12:27 +01:00
parent a8412dc020
commit 4b1ce72c23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/testserver.pri
View File

@ -56,6 +56,9 @@ TESTSERVER_VERSION = $$system(docker-compose --version)
equals(QMAKE_HOST.os, Darwin)|equals(QMAKE_HOST.os, Windows)|isEmpty(TESTSERVER_VERSION) {
# Make check with server "qt-test-server.qt-test-net" as a fallback
message("testserver: qt-test-server.qt-test-net")
} else:equals(QMAKE_HOST.os, Linux) {
# Disable Docker-based test server and use "qt-test-server.qt-test-net" server as a fallback
message("testserver: qt-test-server.qt-test-net")
} else {
# Make check with test servers
equals(QMAKE_HOST.os, Darwin) {