From 185eb5b414e202419a807973244432419841905d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 26 Oct 2017 14:06:14 +0300 Subject: Cleanup of provisioning scripts as tier1 images are vanilla Change-Id: I58c5cb64075c0b60e2e8881dd32d6fad3ab98ec7 Reviewed-by: Heikki Halmet --- coin/provisioning/common/cmake.ps1 | 6 --- coin/provisioning/common/linux-removethemall.sh | 49 ----------------- coin/provisioning/common/mysql.ps1 | 5 -- coin/provisioning/common/postgresql.ps1 | 5 -- coin/provisioning/common/qnx_700.sh | 3 -- coin/provisioning/common/windows_removethemall.ps1 | 61 ---------------------- .../01-windows_removethemall.ps1 | 1 - .../01-windows_removethemall.ps1 | 1 - 8 files changed, 131 deletions(-) delete mode 100755 coin/provisioning/common/linux-removethemall.sh delete mode 100644 coin/provisioning/common/windows_removethemall.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 8a94dc5d..1716467c 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -44,12 +44,6 @@ Download $officialurl $cachedurl $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" Extract-Zip $zip C: -# TODO: Remove line below after all Windows TIER2 VMs are based on vanilla OS -if((Test-Path -Path "C:\CMake" )){ - try { - Rename-Item -ErrorAction 'Stop' "C:\CMake" C:\CMake_old - } catch {} -} $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" Rename-Item $defaultinstallfolder C:\CMake diff --git a/coin/provisioning/common/linux-removethemall.sh b/coin/provisioning/common/linux-removethemall.sh deleted file mode 100755 index 4386ec74..00000000 --- a/coin/provisioning/common/linux-removethemall.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/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$ -## -############################################################################# - -# This script removes preinstalled sw. -# NOTE! Make sure that ALL software which are removed here have provision script under platrom folders which calls this script - -function RemoveDir { - targetFolder=$1 - - if [ -d "$targetFolder" ]; then - echo "Removing existing $targetFolder..." - sudo rm -fr "$targetFolder" - fi -} - -# Android -RemoveDir /opt/android diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/mysql.ps1 index e300566e..63088861 100644 --- a/coin/provisioning/common/mysql.ps1 +++ b/coin/provisioning/common/mysql.ps1 @@ -57,11 +57,6 @@ function DownloadAndInstall Remove-Item $package } -# Remove any leftovers -try { - Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted -} catch {} - if( (is64bitWinHost) -eq 1 ) { # Install x64 bit version $architecture = "x64" diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1 index dd5858a3..ca47f078 100644 --- a/coin/provisioning/common/postgresql.ps1 +++ b/coin/provisioning/common/postgresql.ps1 @@ -48,11 +48,6 @@ if( (is64bitWinHost) -eq 1 ) { $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" - # Delete any leftovers - try { - Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted - } catch {} - echo "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 Verify-Checksum $packagex64 $sha1 diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/qnx_700.sh index 0c27e2af..0b17a7a0 100644 --- a/coin/provisioning/common/qnx_700.sh +++ b/coin/provisioning/common/qnx_700.sh @@ -46,9 +46,6 @@ echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" if [ ! -d "$targetFolder" ]; then mkdir -p $targetFolder fi -if [ -d "$targetFolder/$folderName" ]; then - rm -rf $targetFolder/$folderName -fi sudo tar -C $targetFolder -Jxf $targetFile|| echo "Failed to extract $targetFile" sudo chown -R qt:users "$targetFolder"/"$folderName" diff --git a/coin/provisioning/common/windows_removethemall.ps1 b/coin/provisioning/common/windows_removethemall.ps1 deleted file mode 100644 index 0e584900..00000000 --- a/coin/provisioning/common/windows_removethemall.ps1 +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################# -## -## 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 Remove { -Param ( - [string]$1 - ) - If (Test-Path $1){ - echo "Remove $1" - Remove-Item -Recurse -Force $1 - }Else{ - echo "'$1' does not exists or already removed !!" - } - -} - -Function Remove-Path { - Param ( - [string]$Path - ) - echo "Remove $path from Path" - $name = "Path" - $value = ([System.Environment]::GetEnvironmentVariable("Path").Split(";") | ? {$_ -ne "$path"}) -join ";" - $type = "Machine" - [System.Environment]::SetEnvironmentVariable($name,$value,$type) -} - -# Remove Android sdk and ndk -dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" } -[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User") -[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User") diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 deleted file mode 100644 index dfca166f..00000000 --- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 deleted file mode 100644 index dfca166f..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows_removethemall.ps1" -- cgit v1.2.3