diff options
| author | Ryan Chu <ryan.chu@qt.io> | 2018-12-03 11:12:27 +0100 |
|---|---|---|
| committer | Ryan Chu <ryan.chu@qt.io> | 2018-12-03 16:53:49 +0000 |
| commit | 4b1ce72c232b21fb1a8ae8ca86c2b8a7bc00b993 (patch) | |
| tree | 0983c85eba188501c5c3ca5a6feed39ef9252db7 | |
| parent | a8412dc020e82b45b54b0b6637b8b88b255c413a (diff) | |
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>
| -rw-r--r-- | tests/auto/testserver.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/testserver.pri b/tests/auto/testserver.pri index eefb29ab19..3289a14fd2 100644 --- a/tests/auto/testserver.pri +++ b/tests/auto/testserver.pri @@ -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) { |