From a2a13dcb95636c3fb48ae2e37b25d695a740ba48 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 30 Mar 2021 09:54:45 +0300 Subject: Provisioning: Reset Time Zone for macOS 10.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Setting Time Zone for macOS 10.14 seems to be flaky. Let's reset it. If it still fails to set it then exit the script execution. Task-number: QTBUG-92174 Change-Id: I07b28d0511d8fc097a1da43b78de9a5131f6bfa7 Reviewed-by: Tony Sarajärvi (cherry picked from commit ba149a162bb5683fbc139f57f4669f970f47f03d) Reviewed-by: Jani Heikkinen (cherry picked from commit c84925c5122732d280837be444d82943c2f7bf73) --- .../provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh index 79eba834..f5e85f5f 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -97,5 +97,17 @@ echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT +# Setting Time Zone seems to be flaky in macOS 10.13 and in macOS 10.14. Checking that Time Zone is correct. If not, reset it. +if [[ $(sudo systemsetup -gettimezone) = *GMT* ]]; then + echo "Time Zone is GMT" +else + echo "Wrong Time Zone. Reset Time Zone to GMT" + sleep 5 + sudo systemsetup settimezone GMT + if [[ $(sudo systemsetup -gettimezone) != *GMT* ]]; then + echo "Couldn't set Time Zone!" + exit 1 + fi +fi sudo systemsetup setusingnetworktime off sudo rm -f "$targetFile" -- cgit v1.2.3