Skip to content

Commit

Permalink
Disable Docker-based test servers on Linux temporarily
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ryanjh committed Dec 3, 2018
1 parent a8412dc commit 4b1ce72
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tests/auto/testserver.pri
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 4b1ce72

Please sign in to comment.