1 files changed, 49 insertions, 67 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh
index 7592814b..0195d84a 100755
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -1,37 +1,6 @@
 #!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# Copyright (C) 2020 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
@@ -41,42 +10,51 @@ set -ex
 # This script will fetch and extract pre-buildt squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.5.2"
-qtBranch="514x"
+version="7.2.1"
+qtBranch="66x"
 installFolder="/opt"
 squishFolder="$installFolder/squish"
-preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
-licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/.squish-3-license"
+preBuildCacheUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/jenkins_build/stable"
+licenseFile=".squish-license"
+licenseBranch="squish_license"
+licenseUrl="http://ci-files01-hki.ci.qt.io/input/squish/coin/$licenseBranch/$licenseFile"
+licenseSHA="e84b499a2011f9bb1a6eefc7b2338d7ae770927a"
+testSuiteUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/coin/suite_test_squish"
+testSuiteLocal="/tmp/squish_test_suite"
 if uname -a |grep -q Darwin; then
-     compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
-     sha1="91a1d7228dc4b4bd64f93191c33d2642abc97e14"
+    compressedFolder="prebuild-squish-$version-$qtBranch-mac.tar.gz"
+    sha1="7467c974b65255c86b8fccaeca90e0590d4f7c96"
 else
      compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="63f33de55770e2588dd9f482546900e33d20f8ec"
+     sha1="950a6035c777c8ce0a50a0b3ad468044d07f898b"
 fi
 
 mountFolder="/tmp/squish"
 sudo mkdir "$mountFolder"
+sudo mkdir "$testSuiteLocal"
 
 # Check which platform
 if uname -a |grep -q Darwin; then
     usersGroup="staff"
-    squishLicenseDir="/Users/qt"
 elif uname -a |grep -q "el7"; then
     usersGroup="qt"
-    squishLicenseDir="/root"
 elif uname -a |grep -q "Ubuntu"; then
     usersGroup="users"
-    squishLicenseDir="/home/qt"
 else
     usersGroup="users"
-    squishLicenseDir="/root"
 fi
 
 targetFileMount="$mountFolder"/"$compressedFolder"
 
-echo "Mounting $preBuildCacheUrl to $mountFolder"
-sudo mount "$preBuildCacheUrl" "$mountFolder"
+echo "Mounting Squish packages from $preBuildCacheUrl to $mountFolder"
+echo "Mounting Squish test suite from $testSuiteUrl to $testSuiteLocal"
+if uname -a |grep -q Darwin; then
+   sudo mount -o locallocks "$preBuildCacheUrl" "$mountFolder"
+   sudo mount -o locallocks "$testSuiteUrl" "$testSuiteLocal"
+else
+   sudo mount "$preBuildCacheUrl" "$mountFolder"
+   sudo mount "$testSuiteUrl" "$testSuiteLocal"
+fi
 echo "Create $installFolder if needed"
 if [ !  -d "$installFolder" ]; then
     sudo mkdir "$installFolder"
@@ -87,38 +65,42 @@ VerifyHash "$targetFileMount" "$sha1"
 echo "Uncompress $compressedFolder"
 sudo tar -xzf "$targetFileMount" --directory "$installFolder"
 
-echo "Unmounting $mountFolder"
-sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
-
-sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
+if uname -a |grep -q Darwin; then
+    sudo xattr -r -c "$squishFolder"
+fi
 
 if uname -a |grep -q "Ubuntu"; then
     if [ ! -e "/usr/lib/tcl8.6" ]; then
         sudo mkdir /usr/lib/tcl8.6
-        sudo cp "$squishFolder/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
+        #this needs to be copied only to squish_for_qt65
+        sudo cp "$squishFolder/squish_for_qt66/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
     fi
 fi
 
-DownloadURL "$licenseUrl" "$licenseUrl" "3c6b2b3ca047f68e20f697afcc3a9d376f01b376" "$HOME/.squish-3-license"
+echo "Download Squish license"
+DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/$licenseFile"
 
 echo "Changing ownerships"
 sudo chown -R qt:$usersGroup "$squishFolder"
-sudo chown qt:$usersGroup "$HOME/.squish-3-license"
+sudo chown qt:$usersGroup "$HOME/$licenseFile"
 
-echo "Set commands for environment variables in .bashrc"
-if uname -a |grep -q "Ubuntu"; then
-    echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile
-    echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile
-else
-    echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc
-    echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc
-fi
 
-echo "Verifying Squish"
-if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-    echo "Squish installation tested successfully"
-else
-    echo "Squish test failed! Package wasn't installed correctly."
+echo "Verifying Squish, available installations:"
+ls -la $squishFolder
+cd $squishFolder
+
+for squishInstallation in */ ; do
+  if "$squishInstallation/bin/squishrunner" --testsuite "$testSuiteLocal" | grep "Squish test run successfully" ; then
+    echo "Squish in $squishInstallation tested successfully"
+  else
+    echo "Testing Squish in $squishInstallation failed! Squish wasn't installed correctly."
     exit 1
-fi
+  fi
+done
+
+echo "Clean up installation temp dirs"
+echo "- Unmounting $mountFolder"
+sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" || true
 
+echo "- Unmounting $testSuiteLocal"
+sudo diskutil unmount force "$testSuiteLocal" || sudo umount -f "$testSuiteLocal" || true