diff options
9 files changed, 55 insertions, 124 deletions
diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt index 5453a022..8143688f 100644 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -1,5 +1,6 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86-6 MSVC2017 Release ForceDebugInfo OpenGLDynamic diff --git a/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh index d322e806..d20a4ed8 100755 --- a/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh @@ -76,7 +76,7 @@ function InstallAppFromCompressedFileFromURL { tar -xzf "$targetFile" --directory "$targetDirectory" ;; "zip") - unzip "$targetFile" -d "$targetDirectory" + unzip -q "$targetFile" -d "$targetDirectory" ;; *) exit 1 diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index 73750489..0c548e63 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -71,6 +71,9 @@ Run-Executable "$javaPackage" "/s SPONSORS=0" Write-Host "Cleaning $javaPackage.." Remove-Item -Recurse -Force -Path "$javaPackage" +Write-Host "Remove Java update from startup" +reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f + Set-EnvironmentVariable "JAVA_HOME" "$installdir" Add-Path "$installdir\bin" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 31ae8264..fe221890 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -33,13 +33,18 @@ . "$PSScriptRoot\helpers.ps1" - # This script will install squish package for Windows. # Squish is need by Release Test Automation (RTA) +# NOTE! Make sure 64bit versions are always installed before 32bit, +# because they use same folder name before a rename $version = "6.3.0" + # Qt branch without dot (*.*) $qtBranch = "59x" +# So far Squish built with Qt5.9 works also with 5.10 and 5.11, but we have to be prepared that on some point +# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. + $targetDir = "C:\Utils\squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" $squishBranchUrl = "$squishUrl\$qtBranch" @@ -49,23 +54,10 @@ $licensePackage = ".squish-3-license" $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName -# This can be removed when using vanilla os -if ((Test-Path -Path "$targetDir" )) { - try { - Write-Host "Renaming old Squish" - Write-Host "Rename-Item -ErrorAction 'Stop' $targetDir $targetDir_deleted" - Rename-Item -ErrorAction 'Stop' "$targetDir" squish_deleted - } catch {} -} - Function DownloadAndInstallSquish { - Param ( [string]$version, - [string]$squishBranchUrl, - [string]$qtBranch, [string]$bit, - [string]$targetDir, [string]$squishPackage ) @@ -78,81 +70,57 @@ Function DownloadAndInstallSquish { Write-Host "Installing Squish" Run-Executable "$SquishInstaller" "$SquishParameters" Remove-Item -Path $SquishInstaller + if ("$bit" -eq "win64") { + if ($squishPackage.StartsWith("mingw")) { + $squishPackage64bit = "mingw_64" + } else { + $squishPackage64bit = "$squishPackage`_64" + } + Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit + } else { + if ($squishPackage.StartsWith("mingw")) { + Rename-Item $targetDir\$squishPackage $targetDir\mingw + } + } } Function DownloadSquishLicence { - Param ( - [string]$licensePackage, - [string]$squishUrl, - [string]$targetDir + [string]$squishUrl ) - # This can be removed when using vanilla os - if ($Env:SQUISH_LICENSEKEY_DIR) { - Write-Host "Removing SQUISH_LICENSEKEY_DIR env variable" - Remove-Item Env:\SQUISH_LICENSEKEY_DIR - } - Write-Host "Installing Squish license to home directory" Copy-Item $squishUrl\$licensePackage ~\$licensePackage } + Write-Host "Creating $targetDir" New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir" -DownloadSquishLicence $licensePackage $squishUrl $targetDir - -if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 8.1 Enterprise")) { - # Squish for MinGW - $squishPackageMingw = "mingw_gcc53_posix_dwarf" - Write-Host "Installing $squishPackageMingw" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw - mv $targetDir\$squishPackageMingw $targetDir\mingw +DownloadSquishLicence $squishUrl - # Squish for Visual Studio 2015 - $squishPackage = "msvc14" - $squishPackage64bit = "msvc14_64" +if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { - Write-Host "Installing $squishPackage64bit" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage - Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit + DownloadAndInstallSquish $version win64 msvc14 } + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" + DownloadAndInstallSquish $version win32 "msvc14" - Write-Host "Installing $squishPackage" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage -} -if ($OSVersion -eq "Windows 8.1 Enterprise") { - # Squish for Visual Studio 2013 - $squishPackage64bit = "msvc12_64" +} elseif ($OSVersion -eq "Windows 8.1 Enterprise") { if (Is64BitWinHost) { - Write-Host "Installing $squishPackage_64" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage - Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit - } else { - Write-Host "Change secret file to normal one" - Run-Executable "attrib.exe" "-h C:\Users\qt\.squish-3-license" + DownloadAndInstallSquish $version win64 "msvc12" + DownloadAndInstallSquish $version win64 "msvc14" } -} -if ($OSVersion -eq "Windows 7 Enterprise") { - # Squish for MinGW - $squishPackageMingw = "mingw_gcc53_posix_dwarf" - Write-Host "Installing $squishPackageMingw" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw - Rename-Item $targetDir\$squishPackageMingw $targetDir\mingw + DownloadAndInstallSquish $version win32 "msvc14" - # Squish for Visual Studio 2015 - $squishPackage = "msvc14" - $squishPackage64bit = "msvc14_64" +} elseif ($OSVersion -eq "Windows 7 Enterprise") { if (Is64BitWinHost) { - Write-Host "Installing $squishPackage64bit" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage - Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit + DownloadAndInstallSquish $version win64 "msvc12" + DownloadAndInstallSquish $version win64 "msvc14" } - - Write-Host "Installing $squishPackage" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" + DownloadAndInstallSquish $version win32 "msvc14" } diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh index cd0f3dc2..548cb9ca 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh @@ -35,6 +35,10 @@ set -ex +echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf +sudo systemctl stop packagekit +sudo systemctl disable packagekit + sudo subscription-manager config --rhsm.manage_repos=0 sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 7c595e3a..56ed138a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -48,7 +48,6 @@ installPackages+=(mesa-libGL-devel) installPackages+=(libxkbfile-devel) # Xinput2 installPackages+=(libXi-devel) -installPackages+=(python-devel) installPackages+=(mysql-server) installPackages+=(mysql) installPackages+=(mysql-devel) @@ -64,8 +63,10 @@ installPackages+=(gtk3-devel) installPackages+=(libusbx-devel) # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux installPackages+=(speech-dispatcher-devel) -# Python -installPackages+=(python-devel python-virtualenv) +# Python 2.7 with python-devel, pip and virtualenv +installPackages+=(python27) +# Python 3 with python-devel, pip and virtualenv +installPackages+=(rh-python36) # WebEngine installPackages+=(bison) installPackages+=(flex) @@ -91,3 +92,9 @@ installPackages+=(libffi-devel) sudo yum -y update sudo yum -y install "${installPackages[@]}" + +# Make python 2.7 and its pip default +echo "source scl_source enable python27" >> ~/.bashrc + +sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 +sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh deleted file mode 100755 index 4e75633d..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -set -ex - -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -# install python3 -sudo yum install -y python34-devel - -# install pip3 - -packagePip="get-pip.py" -OfficialUrlPip="https://bootstrap.pypa.io/$packagePip" -CachedUrlPip="http://ci-files01-hki.intra.qt.io/input/redhat/$packagePip" -SHA1Pip="3d45cef22b043b2b333baa63abaa99544e9c031d" - -DownloadURL $CachedUrlPip $OfficialUrlPip $SHA1Pip ./$packagePip -sudo python3 $packagePip -sudo rm -f $packagePip -sudo pip3 install virtualenv - diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-python2.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-python2.ps1 new file mode 100644 index 00000000..e2e9be9c --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-python2.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 new file mode 100644 index 00000000..998e6bae --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\python3.ps1" |