From ada909932df1690c077d4c19e5aa5564c6d4a883 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 9 Oct 2017 11:42:37 +0300 Subject: Provisioning: Update Java to version 8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Current version of Java isn't installing correctly during provisioning. Silent installation needs parameters which are added to script. Without those the installation process tries to open Java3BillDevices.jpg unsuccessfully and the installation fails Task-number: QTQAINFRA-1498 Task-number: QTQAINFRA-1394 Change-Id: I5672d230eb348186345887da81cdd97a4f59bce8 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/install-java.ps1 | 62 ------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 coin/provisioning/common/install-java.ps1 (limited to 'coin/provisioning/common') diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1 deleted file mode 100644 index 50f12c89..00000000 --- a/coin/provisioning/common/install-java.ps1 +++ /dev/null @@ -1,62 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################# - -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Java RE -# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only. - -$installdir = "C:\Program Files\Java\jre7" - -$version = "7u7" -if( (is64bitWinHost) -eq 1 ) { - $arch = "x64" - $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3" -} -else { - $arch = "i586" - $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219" -} - -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".exe" -$javaPackage = "C:\Windows\Temp\java-$version.exe" - -Copy-Item $url_cache $javaPackage -cmd /c "$javaPackage /s SPONSORS=0" -echo "Cleaning $javaPackage.." -Remove-Item -Recurse -Force "$javaPackage" - -[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine) -Add-Path "$installdir\bin" - -echo "Java = $version $arch" >> ~\versions.txt -- cgit v1.2.3 From 3653630d229390c9ce5517afcce371860d2ad822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Fri, 10 Nov 2017 12:33:05 +0100 Subject: Provisioning: Disable NTP synchronization for Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During CI, it has been observed that some processes didn't leave their wait state. (So they were "hanging") During analysis of the event log on that CI node, we found out that at the same time those processes entered this state, the NTP client set a new time and indeed the local time of the CI node changed (it was changed 2 hours forward in our case). For the record, the processes we observed this with was jom.exe and cc1plus.exe (the latter is the g++ compiler in the mingw toolchain)). We therefore have a strong suspicion that the NTP time change was causing the CI hang, so we simply disable it. The virtual machine should anyway get the correct time from its VM host when its started. Change-Id: I1204063399e2a4741b7b26b79858759c1bc5eab2 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/disable-ntp.ps1 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 coin/provisioning/common/disable-ntp.ps1 (limited to 'coin/provisioning/common') diff --git a/coin/provisioning/common/disable-ntp.ps1 b/coin/provisioning/common/disable-ntp.ps1 new file mode 100644 index 00000000..4ec9d1bd --- /dev/null +++ b/coin/provisioning/common/disable-ntp.ps1 @@ -0,0 +1,2 @@ +# Disable the NTP from syncing +w32tm /config /syncfromflags:NO -- cgit v1.2.3 From d56552566fc61bd2a659b2a3538bd555d435ae89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 21 Sep 2017 13:47:45 +0300 Subject: Provisioning: FBX SDK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to provision the FBX SDK for Qt3DStudio. Task-number: QTQAINFRA-1449 Change-Id: I52587cd653b7954340d5f58978ffbd008330337c Reviewed-by: Marianne Yrjänä Reviewed-by: Miikka Heikkinen Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/fbx_linux.sh | 62 +++++++++++++++++++++++++ coin/provisioning/common/fbx_macos.sh | 79 ++++++++++++++++++++++++++++++++ coin/provisioning/common/fbx_windows.ps1 | 68 +++++++++++++++++++++++++++ 3 files changed, 209 insertions(+) create mode 100755 coin/provisioning/common/fbx_linux.sh create mode 100755 coin/provisioning/common/fbx_macos.sh create mode 100644 coin/provisioning/common/fbx_windows.ps1 (limited to 'coin/provisioning/common') diff --git a/coin/provisioning/common/fbx_linux.sh b/coin/provisioning/common/fbx_linux.sh new file mode 100755 index 00000000..66d4793b --- /dev/null +++ b/coin/provisioning/common/fbx_linux.sh @@ -0,0 +1,62 @@ +#!/bin/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$ +## +############################################################################# + +# This script installs FBX SDK +source "${BASH_SOURCE%/*}/DownloadURL.sh" +#s script installs FBX SDK + +set -e +tarballName="fbx20161_2_fbxsdk_linux.tar.gz" +targetFolder="/opt/fbx" +cachedUrl="http://ci-files01-hki.intra.qt.io/input/fbx/$tarballName" +officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$tarballName" +sha1="b0a08778de025e2c6e90d6fbdb6531f74a3da605" +tmpFolder="/tmp" +targetFile="$tmpFolder/$tarballName" +installer="$tmpFolder/fbx20161_2_fbxsdk_linux" + +DownloadURL "$cachedUrl" "$officialUrl" "$sha1" "$targetFile" + +sudo tar -C $tmpFolder -xf "$targetFile" +sudo mkdir -p $targetFolder +(echo "yes"; echo "n") | sudo "$installer" -w "$tmpFolder" "$targetFolder" + +rm -rf "$targetFile" + +# Set env variables +echo "export FBXSDK=$targetFolder" >> ~/.profile + +echo "FBX SDK = 2016.1.2" >> ~/versions.txt + diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/fbx_macos.sh new file mode 100755 index 00000000..66a2d998 --- /dev/null +++ b/coin/provisioning/common/fbx_macos.sh @@ -0,0 +1,79 @@ +#!/bin/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$ +## +############################################################################# + +# This script installs FBX SDK + +# shellcheck source=./try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" + +fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz" +targetFolder="/opt/fbx" +cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName" +officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName" +sha1="f82535423c700c605320c52e13e781c92208ec6b" +targetFolder="/tmp" +targetFile="$targetFolder/$fileName" +installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg" + +ExceptionExtractPrimaryUrl=100 + +try +( + echo "Extracting '$cachedUrl'" + tar -xzf "$cachedUrl" -C "$targetFolder" || throw $ExceptionExtractPrimaryUrl +) +catch || { + case $ex_code in + $ExceptionExtractPrimaryUrl) + set -e + echo "Failed to uncompress from '$cachedUrl'" + echo "Downloading from '$officialUrl'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl" || exit 1; + echo "Checking SHA1 on PKG '$targetFile'" + echo "$sha1 *$targetFile" > $targetFile.sha1 + shasum --check $targetFile.sha1 + echo "Extracting '$targetFile'" + tar -xzf "$targetFile" -C "$targetFolder" || exit 1; + ;; + esac +} +set -e +rm -rf "$targetFile" +echo "Running installer for '$installer'" +sudo installer -pkg "$installer" -target "/" + +# Set env variables +echo "export FBXSDK=/Applications/Autodesk/FBX\ SDK/2016.1.2/" >> ~/.bashrc +echo "FBX SDK = 2016.1.2" >> ~/versions.txt + diff --git a/coin/provisioning/common/fbx_windows.ps1 b/coin/provisioning/common/fbx_windows.ps1 new file mode 100644 index 00000000..00de579d --- /dev/null +++ b/coin/provisioning/common/fbx_windows.ps1 @@ -0,0 +1,68 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will install FBX SDK + +$version = "2016.1.2" + +$name = "fbx20161_2_fbxsdk_vs2015_win" +$packageName = "$name.7z" +$installerName = "$name.exe" +$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName" +$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24" + +# The executable is an interactive installer only. We can't run it in a script silently. +# $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName" +# This sha is for the executable +# $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e" + +#$targetFile = "C:\Windows\Temp\$packageName" +$targetFolder = "C:\Program Files\" + +#echo "Downloading '$installerName'" +#Download $officialUrl $cacheUrl $targetFile +#Verify-Checksum $targetFile $sha1 + +echo "Extracting '$cacheUrl'" +#Extract-7Zip $cacheUrl $targetFolder +Start-Process -FilePath "C:\Utils\sevenzip\7z.exe" -ArgumentList "x -y `"$cacheUrl`" -o`"$targetFolder`"" -Wait + +#Remove-Item -Recurse -Force "$packageName" + +echo "Adding environment variables." +[Environment]::SetEnvironmentVariable("FBXSDK", "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2", [EnvironmentVariableTarget]::Machine) + +echo "FBX SDK = $version" >> ~\versions.txt + -- cgit v1.2.3 From f84bab04f7698e924cde88385c8a6f92e77b1297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 13 Nov 2017 13:40:42 +0200 Subject: Remove unneeded provisioning scripts Change-Id: Ie8ff5810f07528fd23044e1b1396fc4fdde58283 Reviewed-by: Heikki Halmet --- coin/provisioning/common/01-macos-removethemall.sh | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 coin/provisioning/common/01-macos-removethemall.sh (limited to 'coin/provisioning/common') diff --git a/coin/provisioning/common/01-macos-removethemall.sh b/coin/provisioning/common/01-macos-removethemall.sh deleted file mode 100644 index f0e26480..00000000 --- a/coin/provisioning/common/01-macos-removethemall.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite 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$ -## -############################################################################# - -function RemoveDir { - param=$1 - - if [ ! -d $param ] - then - echo "'$param' don't exists" - else - echo "Removing $param..." - sudo rm -fr $param - fi -} - -# Remove Android -param="/opt/android" -RemoveDir $param -- cgit v1.2.3