From fa03dbce1f1eff1967d6607e1c41c8fc41cc0a09 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 19 Aug 2019 14:48:31 +0300 Subject: Platform configurations: Move Android_ANY (clang-x86) to default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Arm targets from default change places with clang-x86 from qt5 Task-number: QTQAINFRA-3153 Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 20 ++++++++++++++------ coin/platform_configs/qt5.yaml | 30 +++++++++++------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 4ac899de..55e73038 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -40,6 +40,14 @@ Configurations: Compiler: 'MSVC2017' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' +- + Template: 'qtci-windows-10-x86_64-14' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' @@ -130,21 +138,21 @@ Configurations: Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' - - Template: 'qtci-linux-RHEL-7.6-x86_64' + Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' - Target arch: 'armv7' + Target arch: 'x86' Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'Clang' + Target arch: 'x86' + Compiler: 'GCC' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 69f1c7e3..49116bd3 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -37,35 +37,35 @@ - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' + Target arch: 'armv7' + Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Mingw73' + Target arch: 'arm64' + Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' - Target arch: 'arm64' + Target arch: 'armv7' Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' - Target arch: 'x86' + Target arch: 'arm64' Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -82,14 +82,6 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' -- cgit v1.2.3 From b83b16277d1758c868779f931934deca7b4390b0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 12 Sep 2019 23:31:14 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: Icc4380912fc6d1cbb35b2282c37a180641186f60 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index bc34784d..447ee95d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bc34784d053ebf9b0d167e9398052fcc80d8af87 +Subproject commit 447ee95d5e050c5db1636c5d3bd0edbf59f26108 diff --git a/qtdeclarative b/qtdeclarative index f19ec456..69f62dc8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f19ec4561b4975d68290593b599d3c38d0f9f6d3 +Subproject commit 69f62dc8efc738dff1fac50f8a6d8b2b09e654cf diff --git a/qtdoc b/qtdoc index 2d933241..1715eeed 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2d9332410e4353e463c3e492bf4364396e45168d +Subproject commit 1715eeed9972fbe2b72562e7bc1015695927bf7c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c18c7bd7..a5be4ae5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c18c7bd7f9596e5ad3d13876a91203e1ceba2544 +Subproject commit a5be4ae50c40f938ca8660296362fc06cc8273b1 diff --git a/qttools b/qttools index b0e9c1c5..5cfa917b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b0e9c1c5367ab6da76850139bddab2578fc179cd +Subproject commit 5cfa917baf416f6234bd99e51f05514b1859e2fe diff --git a/qtwebengine b/qtwebengine index 2f720836..c795c96e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2f72083601fb6a4fcc66b6440222291fc334cb3f +Subproject commit c795c96eaa740d6743293af8c6b01bcc58cec64a -- cgit v1.2.3 From a3136bdbfef242339c002630f51b4bc0f5c05503 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 3 Sep 2019 12:46:29 +0300 Subject: Provisioning: Disable or delete unneeded tasks and services MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows have lot's of tasks and services running which are slowing the performance of build machine. Also 'windows' and 'windows defender' updates need's to be "permanently" disabled. Task-number: QTQAINFRA-3182 Change-Id: I8f6b237fcdc6e38fa9a06836d349821d86c58afc Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-schedule-tasks.ps1 | 88 ++++++++++++++++++++++ .../common/windows/disable-update-orchestrator.ps1 | 16 ++++ .../common/windows/disable-windefender.ps1 | 51 +++++++++++++ .../windows/disable-windows-file-protector.ps1 | 4 + .../windows/disable-windows-module-installer.ps1 | 4 + .../windows/disable-windows-update-medic.ps1 | 25 ++++++ coin/provisioning/common/windows/helpers.ps1 | 20 +++++ .../98-disable-file-protector.ps1 | 1 + .../98-disable-schedule-tasks.ps1 | 1 + .../98-disable-update-orchestrator.ps1 | 1 + .../98-disable-windows-module-installer.ps1 | 1 + .../98-disable-windows-update-medic.ps1 | 2 + 12 files changed, 214 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-schedule-tasks.ps1 create mode 100644 coin/provisioning/common/windows/disable-update-orchestrator.ps1 create mode 100644 coin/provisioning/common/windows/disable-windows-file-protector.ps1 create mode 100644 coin/provisioning/common/windows/disable-windows-module-installer.ps1 create mode 100644 coin/provisioning/common/windows/disable-windows-update-medic.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 diff --git a/coin/provisioning/common/windows/disable-schedule-tasks.ps1 b/coin/provisioning/common/windows/disable-schedule-tasks.ps1 new file mode 100644 index 00000000..351f10c6 --- /dev/null +++ b/coin/provisioning/common/windows/disable-schedule-tasks.ps1 @@ -0,0 +1,88 @@ +. "$PSScriptRoot\helpers.ps1" + +# This script will remove unneeded Tasks from Task Scheduler + +# Application Experience 'Microsoft Compatibility Appraiser' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Application Experience\Microsoft Compatibility Appraiser" + +# Application Experience 'ProgramDataUpdater' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program" +DisableSchedulerTask "Application Experience\ProgramDataUpdater" + +# Autochk 'Proxy' - "This task collects and uploads autochk SQM data if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Autochk\Proxy" + +# Chkdsk 'ProactiveScan' - "NTFS Volume Health Scan" +DisableSchedulerTask "Chkdsk\ProactiveScan" + +# Chkdsk 'SyspartRepair' +DeleteSchedulerTask "Chkdsk\SyspartRepair" + +# Customer Experience Improvement Program 'Consolidator' - "If the user has consented to participate in the Windows Customer Experience Improvement Program, this job collects and sends usage data to Microsoft." +DisableSchedulerTask "Customer Experience Improvement Program\Consolidator" + +# Customer Experience Improvement Program 'sbCeip' - "The USB CEIP (Customer Experience Improvement Program) task collects Universal Serial Bus related statistics and information about your machine and sends it to the Windows Device Connectivity engineering group at Microsoft. The information received is used to help improve the reliability, stability, and overall functionality of USB in Windows. If the user has not consented to participate in Windows CEIP, this task does not do anything." +DisableSchedulerTask "Customer Experience Improvement Program\UsbCeip" + +# Device Information 'Device' +DisableSchedulerTask "Device Information\Device" + +# Diagnosis 'Scheduled' - "The Windows Scheduled Maintenance Task performs periodic maintenance of the computer system by fixing problems automatically or reporting them through Security and Maintenance." +DisableSchedulerTask "Diagnosis\Scheduled" + +# DiskDiagnostic 'Microsoft-Windows-DiskDiagnosticDataCollector' - "The Windows Disk Diagnostic reports general disk and system information to Microsoft for users participating in the Customer Experience Program." +DisableSchedulerTask "DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector" + +# ExploitGuard 'ExploitGuard MDM policy Refresh' - "Task for applying changes to the machine's Exploit Protection settings." +DisableSchedulerTask "ExploitGuard\ExploitGuard MDM policy Refresh" + +# Feedback/Siuf 'DmClient' +DisableSchedulerTask "Feedback\Siuf\DmClient" + +# Feedback/Siuf 'DmClient'OnScenarioDownload' +DisableSchedulerTask "Feedback\Siuf\DmClientOnScenarioDownload" + +# File Classification Infrastructure 'Property Definition Sync' +DisableSchedulerTask "File Classification Infrastructure\Property Definition Sync" + +# InstallService 'ScanForUpdates' +DisableSchedulerTask "InstallService\ScanForUpdates" + +# InstallService 'ScanForUpdatesAsUser' +DisableSchedulerTask "InstallService\ScanForUpdatesAsUser" + +# LanguageComponentsInstaller 'Installation' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\Installation" + +# LanguageComponentsInstaller 'ReconcileLanguageResources' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\ReconcileLanguageResources" + +# PI 'Secure-Boot-Update' - "This task updates the Secure Boot variables." +DisableSchedulerTask "PI\Secure-Boot-Update" + +# PI 'Sqm-Tasks' - "This task gathers information about the Trusted Platform Module (TPM), Secure Boot, and Measured Boot." +DisableSchedulerTask "PI\Sqm-Tasks" + +# Power Efficiency Diagnotics 'AnalyzeSystem' - "This task analyzes the system looking for conditions that may cause high energy use." +DisableSchedulerTask "PushToInstall\Registration" + +# Servicing 'StartComponentCleanup' +DisableSchedulerTask "Servicing\StartComponentCleanup" + +# SettingSync 'BackgroundUploadTask' +DeleteSchedulerTask "SettingSync\BackgroundUploadTask" + +# SoftwareProtectionPlatform 'SvcRestartTask' - "This task restarts the Software Protection Platform service at the specified time" +DeleteSchedulerTask "SoftwareProtectionPlatform\SvcRestartTask" + +# SoftwareProtectionPlatform 'SvcRestartTaskLogon' - "This task restarts the Software Protection Platform service at the specified time" +DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskLogon" + +# SoftwareProtectionPlatform 'SvcRestartTaskNetwork' - "This task restarts the Software Protection Platform service when a new network is detected" +DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskNetwork" + +# UNP 'RunUpdateNotificationMgr' +DeleteSchedulerTask "UNP\RunUpdateNotificationMgr" + + + + diff --git a/coin/provisioning/common/windows/disable-update-orchestrator.ps1 b/coin/provisioning/common/windows/disable-update-orchestrator.ps1 new file mode 100644 index 00000000..5ae8fb0d --- /dev/null +++ b/coin/provisioning/common/windows/disable-update-orchestrator.ps1 @@ -0,0 +1,16 @@ +# Disable UpdateOrchestrator + +$name = "UpdateOrchestrator" +$path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name" + +takeown /F $path /A /R +icacls $path /grant Administrators:F /T +SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE +del "$path\Schedule Scan" +del "$path\Schedule Scan Static Task" +del "$path\Backup Scan" +del "$path\UpdateModelTask" +del "$path\USO_UxBroker" + +# Disable Update orchestrator service +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/provisioning/common/windows/disable-windefender.ps1 b/coin/provisioning/common/windows/disable-windefender.ps1 index e508641e..02ed54da 100644 --- a/coin/provisioning/common/windows/disable-windefender.ps1 +++ b/coin/provisioning/common/windows/disable-windefender.ps1 @@ -1,3 +1,36 @@ +########################################################################### +## +## Copyright (C) 2019 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$ +## +############################################################################# + # Turning off win defender. # # If disabled manually, windows will automatically enable it after @@ -6,3 +39,21 @@ . "$PSScriptRoot\helpers.ps1" Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" + +# 'Windows Defender Cache Maintenance' - "Periodic maintenance task." +DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" + +# 'Windows Defender Cleanup' - "Periodic cleanup task." +DisableSchedulerTask "Windows Defender\Windows Defender Cleanup" + +# 'Windows Defender Scheduled Scan' - "Periodic scan task." +DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan" + +# 'Windows Defender Verification' - "Periodic verification task." +DisableSchedulerTask "Windows Defender\Windows Defender Verification" + +# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." +DisableSchedulerTask "Windows Error Reporting\QueueReporting" + +# Disable WindowsUpdate from Task Scheduler +DisableSchedulerTask "WindowsUpdate\Scheduled Start" diff --git a/coin/provisioning/common/windows/disable-windows-file-protector.ps1 b/coin/provisioning/common/windows/disable-windows-file-protector.ps1 new file mode 100644 index 00000000..f1d09fb5 --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-file-protector.ps1 @@ -0,0 +1,4 @@ +# Disable Windows File Protection +# Windows File Protection feature in Microsoft Windows prevents programs from replacing critical Windows system files. + +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /V SFCDisable /T REG_dWORD /D 0xffffff9d /F diff --git a/coin/provisioning/common/windows/disable-windows-module-installer.ps1 b/coin/provisioning/common/windows/disable-windows-module-installer.ps1 new file mode 100644 index 00000000..c7f85ff7 --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-module-installer.ps1 @@ -0,0 +1,4 @@ +# Disable Windows Module Installer (Trusted Installer). +# Trusted Installe enables installation, modification, and removal of Windows updates and optional components. +# If this service is disabled, install or uninstall of Windows updates might fail for this computer. +sc.exe config TrustedInstaller start=disabled diff --git a/coin/provisioning/common/windows/disable-windows-update-medic.ps1 b/coin/provisioning/common/windows/disable-windows-update-medic.ps1 new file mode 100644 index 00000000..6accbd3b --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-update-medic.ps1 @@ -0,0 +1,25 @@ +# Windows Update Medic Service (WaaSMedicSvc)'PerformRemediation' helps recover update-related services to the supported configuration. +# WaasMedicSvc keeps re-starting Windows Update, even if it disabled manually. +# Even Admin user don't have privileged to disable PerformRemediation from Task Scheduler which means that WaaSMedicSvc.dll need's to be removed from the system + +$limit = (Get-Date).AddMinutes(20) +$path = "C:\Windows\System32\WaaSMedicSvc.dll" + +DO { + takeown /F $path + icacls $path /grant Administrators:f + Write-host "Deleting $path" + + Try { + del $path + } + Catch [System.UnauthorizedAccessException] { + Write-host "Access to the path '$path' is denied." + Continue + } + + if ((Get-Date) -gt $limit) { + exit 1 + } + +}while (Test-Path -Path "$path") diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index ba35f6b5..0f39beed 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -222,3 +222,23 @@ function Remove { } } } + +function DisableSchedulerTask { + + Param ( + [string]$Task = $(BadParam("a task")) + ) + + Write-Host "Disabling $Task from Task Scheduler" + SCHTASKS /Change /TN "Microsoft\Windows\$Task" /DISABLE +} + +function DeleteSchedulerTask { + + Param ( + [string]$Task = $(BadParam("a task")) + ) + + Write-Host "Disabling $Task from Task Scheduler" + SCHTASKS /DELETE /TN "Microsoft\Windows\$Task" /F +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 new file mode 100644 index 00000000..79802f24 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-file-protector.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 new file mode 100644 index 00000000..9134a735 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-schedule-tasks.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 new file mode 100644 index 00000000..67dcce60 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-update-orchestrator.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 new file mode 100644 index 00000000..fb8ec541 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-module-installer.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 new file mode 100644 index 00000000..7a6ab935 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-update-medic.ps1" + -- cgit v1.2.3 From 0cf3fdabe315d62066a7642787a5058a737a79e4 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 1 Aug 2019 14:51:40 +0300 Subject: Provisioning: Upgrade Python pip version for Windows machines Task-number: QTQAINFRA-2564 Change-Id: I10402bb3169b483c71e44db7ecba443eb4f46dc1 Reviewed-by: Liang Qi --- coin/provisioning/common/windows/python.ps1 | 5 ++++- coin/provisioning/common/windows/python3.ps1 | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index aee4c199..342358d5 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -75,6 +75,9 @@ if (($archVer -eq 32) -And (Is64BitWinHost)) { Run-Executable "$targetDir\python.exe" "-m ensurepip" +Write-Host "Upgrade pip to the latest version available." +Run-Executable "$targetDir\python.exe" "-m pip install --upgrade pip" + # Install python virtual env if (IsProxyEnabled) { $proxy = Get-Proxy diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index c05c022c..8fbd615c 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## @@ -79,6 +79,10 @@ if (IsProxyEnabled) { Write-Host "Using proxy ($proxy) with pip" $pip_args = "--proxy=$proxy" } + +Write-Host "Upgrade pip3 to the latest version available." +Run-Executable "$install_path\python.exe" "-m pip install --upgrade pip" + Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel" # Install all needed packages in a special wheel cache directory -- cgit v1.2.3 From ddc99482eb10a090b61aaf1e7373c5953a664a5b Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 16 Sep 2019 08:59:07 +0300 Subject: Cherry-pick a QEMU fix for "core dumped" during tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-63152 Change-Id: Iac803ca67537eeb9085fb87625103fdde0bfd904 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh index 9a4558e2..3006af47 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh @@ -48,6 +48,7 @@ cd "$tempDir" git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f git cherry-pick 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 git cherry-pick 04b33e21866412689f18b7ad6daf0a54d8f959a7 +git cherry-pick cd8133679f7e0e2c292f631f1c78b2452d2435c7 git submodule update --init pixman patch -p1 < Date: Tue, 17 Sep 2019 14:47:01 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: I42016698eb34b06de2ef9ee268b4b59e9af38f54 Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- qtdoc | 2 +- qtnetworkauth | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 69f62dc8..9d89f901 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 69f62dc8efc738dff1fac50f8a6d8b2b09e654cf +Subproject commit 9d89f9019ecd17d21fa491b55726d60985756a29 diff --git a/qtdoc b/qtdoc index 1715eeed..530a73a8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1715eeed9972fbe2b72562e7bc1015695927bf7c +Subproject commit 530a73a82518543e1432cf439dda5e0305e1224b diff --git a/qtnetworkauth b/qtnetworkauth index a2e48c7e..202c7d89 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit a2e48c7e2a039b7eeeca9d35757e071e8c74605d +Subproject commit 202c7d893f14e65fbb89e9cf7b37a3502bf923ec diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a5be4ae5..d41362ed 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a5be4ae50c40f938ca8660296362fc06cc8273b1 +Subproject commit d41362ed752031fdd798e4838b3a56fbb2717f3f diff --git a/qtwayland b/qtwayland index 813365f4..382e3292 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 813365f472cf3b955d0985f83d0169016806cc36 +Subproject commit 382e3292aa0eb6addac84ddefeedc98c7f3b41b2 diff --git a/qtwebengine b/qtwebengine index c795c96e..891a1ee6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c795c96eaa740d6743293af8c6b01bcc58cec64a +Subproject commit 891a1ee6d0e894e49cc79efbdf864dd2fded5501 diff --git a/qtwebsockets b/qtwebsockets index 81587889..24a9e0f9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 81587889b1563557dd6fdc61dcde2a08445a9243 +Subproject commit 24a9e0f961d84af037999771948d3d3d9c683a6c -- cgit v1.2.3 From 5d3b2413d0f108ed8e19f2cd871ed0efd099f83f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 19 Sep 2019 21:18:07 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: Id1259c1907605ad33cbe7f3be3041b26c01f3387 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index a5b02c4f..7b7d3cbb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a5b02c4f78b0bc7d0c48143e83d8d222f153be52 +Subproject commit 7b7d3cbb23eab884577f2341deb25bdd36c4cae6 diff --git a/qtbase b/qtbase index 447ee95d..0d9f43d5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 447ee95d5e050c5db1636c5d3bd0edbf59f26108 +Subproject commit 0d9f43d534983411e37a9f3912de272a4a6ced64 diff --git a/qtdeclarative b/qtdeclarative index 9d89f901..5e96f43f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9d89f9019ecd17d21fa491b55726d60985756a29 +Subproject commit 5e96f43fe03e16d7ca68f0dd888c4518a98694f2 diff --git a/qtdoc b/qtdoc index 530a73a8..d952a1c0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 530a73a82518543e1432cf439dda5e0305e1224b +Subproject commit d952a1c09db2d5faf3de6c2b1e5218b26246e6d2 diff --git a/qtmultimedia b/qtmultimedia index 81e87e34..43cd99e6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 81e87e34c444404c79a7365e490607c35dc0c661 +Subproject commit 43cd99e688860112aa0dce06e1adb7bde4a06edc diff --git a/qtqa b/qtqa index cd7003a5..1652766d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cd7003a5bb8cf022044ee0fe0e10e5e601dbfcf2 +Subproject commit 1652766da458448756d08e4a09dee1b16700c473 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d41362ed..6815f353 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d41362ed752031fdd798e4838b3a56fbb2717f3f +Subproject commit 6815f353e5a73c0dcf39fbfc91c6a2c1b0784324 diff --git a/qtrepotools b/qtrepotools index 37df2fd6..3b937032 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f +Subproject commit 3b937032f51c75b3f517e02b1db670884a8dc103 diff --git a/qtsensors b/qtsensors index 7191c267..220ab35b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7191c267395a079eb6621198c219fc19ab79d3d5 +Subproject commit 220ab35bfd864cb390e9051b9563587319f58bd4 diff --git a/qtwayland b/qtwayland index 382e3292..7e658cf2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 382e3292aa0eb6addac84ddefeedc98c7f3b41b2 +Subproject commit 7e658cf26dc6e85dbe4a4216f7294dbb3a928dcc diff --git a/qtwebengine b/qtwebengine index 891a1ee6..d8fe250e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 891a1ee6d0e894e49cc79efbdf864dd2fded5501 +Subproject commit d8fe250e542519012247952a034e78b0d492b730 -- cgit v1.2.3 From a4ca20dfce21e68d7b79c8736563705f78d78f23 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 21 Sep 2019 23:31:01 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: I75182fb8b231e3086a77c1778320cf0f2590cf92 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtsensors | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index 0d9f43d5..ac5e198d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0d9f43d534983411e37a9f3912de272a4a6ced64 +Subproject commit ac5e198db4eea4670a5a4a22fb44eb8a6acc4c47 diff --git a/qtdoc b/qtdoc index d952a1c0..a7bacc5e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d952a1c09db2d5faf3de6c2b1e5218b26246e6d2 +Subproject commit a7bacc5e4b357ef3b0d8901963c5f7bb1462720b diff --git a/qtgamepad b/qtgamepad index 572ef46c..324dd701 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 572ef46c5fd98e1052211051362e7c48930deacd +Subproject commit 324dd701ec755684a2bc5c7e8b2d5413316f2f53 diff --git a/qtlocation b/qtlocation index 55e127bb..720beeb3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 55e127bb430aaea9ebf4c770c9efb228e019af25 +Subproject commit 720beeb3f768af5e89538dfe0429e31138e84e3c diff --git a/qtmultimedia b/qtmultimedia index 43cd99e6..fdf2f673 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 43cd99e688860112aa0dce06e1adb7bde4a06edc +Subproject commit fdf2f673701fec9c3b99ad5e602d771c0b5ab9c9 diff --git a/qtsensors b/qtsensors index 220ab35b..9b4c2e4f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 220ab35bfd864cb390e9051b9563587319f58bd4 +Subproject commit 9b4c2e4fcbe8700f0cf95cda887476e9a2d3a545 diff --git a/qttools b/qttools index 5cfa917b..488f2454 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5cfa917baf416f6234bd99e51f05514b1859e2fe +Subproject commit 488f24540d087ae98fff4b3a4de82bdf9acbc72c diff --git a/qtwayland b/qtwayland index 7e658cf2..8f6c41e4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7e658cf26dc6e85dbe4a4216f7294dbb3a928dcc +Subproject commit 8f6c41e49e320de9e0921801ab87a45f6e6f9fa9 diff --git a/qtwebview b/qtwebview index b206dd8a..ca79ed44 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b206dd8a3ccff693eed9bdc271351ed613f23fdf +Subproject commit ca79ed44d8c5cfa4270d5eca824a76cbcb5887fe diff --git a/qtwinextras b/qtwinextras index fb6d18a1..15b00862 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit fb6d18a116dea6f8f1db61053454ce77c17f0e97 +Subproject commit 15b0086268a33e6469e300da9817f723ade0a588 -- cgit v1.2.3 From 1760acb17d0b5938ed827246c88baa00cba47c9a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Sep 2019 23:31:04 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: I5405348497e527dc5b4b1ff411736ffebeedb246 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index ac5e198d..a8ec52d5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ac5e198db4eea4670a5a4a22fb44eb8a6acc4c47 +Subproject commit a8ec52d5e76bc769ed63be1ad543be8f687e5dac diff --git a/qtconnectivity b/qtconnectivity index c1803d26..d3ace860 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c1803d266854c6f71994705133e5b2b93a060d1e +Subproject commit d3ace86011d4e34eeafa795270ac027afd54f857 diff --git a/qtdeclarative b/qtdeclarative index 5e96f43f..36be2726 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5e96f43fe03e16d7ca68f0dd888c4518a98694f2 +Subproject commit 36be27265d61c76b25417a25e482030e30ff380f diff --git a/qtdoc b/qtdoc index a7bacc5e..3825a45d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a7bacc5e4b357ef3b0d8901963c5f7bb1462720b +Subproject commit 3825a45d5c17cba5298417dd68fef973f62f699c diff --git a/qtqa b/qtqa index 1652766d..8cafe2ce 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1652766da458448756d08e4a09dee1b16700c473 +Subproject commit 8cafe2ce3fd9302b29cb8cbfc93414cc6fc7d83c diff --git a/qtrepotools b/qtrepotools index 3b937032..a51db43b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 3b937032f51c75b3f517e02b1db670884a8dc103 +Subproject commit a51db43b580f774c64275cd3e1e0c707de2a04a4 diff --git a/qtserialbus b/qtserialbus index e6b042a7..80144b89 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e6b042a795902226c7d7f1ec576c8e063ef76740 +Subproject commit 80144b89ca1adede0db9d6e485037f5e431216c3 -- cgit v1.2.3 From 41ef5a706d4cd56e37c67195da4c59e24e1400e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 24 Sep 2019 23:30:59 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: I239abc4de7cec9c5366d177933a4b16c85067971 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtquickcontrols2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index a8ec52d5..06cc5d30 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a8ec52d5e76bc769ed63be1ad543be8f687e5dac +Subproject commit 06cc5d307177ebacf8e6926b9690c12703004a1a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6815f353..d39a6d80 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6815f353e5a73c0dcf39fbfc91c6a2c1b0784324 +Subproject commit d39a6d80f63414a4e933ac2f859805635850942a -- cgit v1.2.3 From cb8e769cf611f519a45e11697ea27ad1e4b963b3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 25 Sep 2019 23:31:02 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: I2c212ec01df2fa67cad4d9e84988d0b31678e6fe Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 06cc5d30..94788314 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 06cc5d307177ebacf8e6926b9690c12703004a1a +Subproject commit 947883141d9d8b3079a8a21981ad8a5ce3c4798e diff --git a/qtdoc b/qtdoc index 3825a45d..21d65d5c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3825a45d5c17cba5298417dd68fef973f62f699c +Subproject commit 21d65d5c2dbfadb3e6dae0707f2ba6e0d4bb2c30 diff --git a/qtmultimedia b/qtmultimedia index fdf2f673..bf6ac0f0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fdf2f673701fec9c3b99ad5e602d771c0b5ab9c9 +Subproject commit bf6ac0f0df5510aa65ecd9bb050bd13d47089d4a diff --git a/qtquickcontrols b/qtquickcontrols index ac9f2e58..da94d658 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ac9f2e582dc6c0f740b8c5b225bc65a8c1b35e9e +Subproject commit da94d6586cbe6b9c12dec8ecc0f842aad807b0d3 diff --git a/qtwayland b/qtwayland index 8f6c41e4..1ed0782e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8f6c41e49e320de9e0921801ab87a45f6e6f9fa9 +Subproject commit 1ed0782e93dafb0a3d5ef3a02c9c3999825817ee diff --git a/qtwebengine b/qtwebengine index d8fe250e..e31acc86 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d8fe250e542519012247952a034e78b0d492b730 +Subproject commit e31acc86e991d6f83bd56eebb7371914fc9ca5ac -- cgit v1.2.3 From e6fccbf2407bcb7f4006fd70a2af16451e3a44f1 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 31 Jul 2019 12:05:34 +0200 Subject: Remove the progress bar from the sdkmanager output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cleans up many thousands of useless lines from the logs. Change-Id: I2673f65b713996637d2161da4db726823e17c0df Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/android_linux.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 5840d4b4..b83c1c6e 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -80,14 +80,22 @@ else sudo chown -R qt:users "$targetFolder" fi +# Run the following command under `eval` or `sh -c` so that the shell properly splits it +sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" + echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." # shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1) proxy_port=$(echo "$proxy" | cut -d':' -f3) - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \ + --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd else - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd fi echo "Checking the contents of Android SDK..." @@ -106,8 +114,11 @@ echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt echo "Android NDK = $ndkVersion" >> ~/versions.txt cd "$sdkTargetFolder/tools/bin" -./sdkmanager --install "emulator" -echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" +./sdkmanager --install "emulator" \ + | eval $sdkmanager_no_progress_bar_cmd +echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" \ + | eval $sdkmanager_no_progress_bar_cmd + echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder" -- cgit v1.2.3 From c87a6e9c6d5ee208526e40badfcd12c51f65cf2c Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 31 Jul 2019 12:16:50 +0200 Subject: Fix delays caused by PackageKit locking RPMDB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that disabling it is not enough, it has to be fully removed. It is also removed later in the scripts but it wasn't enough apparently, so no harm done removing it twice. Change-Id: If1a4f032240e66100b68bca3196a700cb570701e Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh index 548cb9ca..28f7faa0 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh @@ -38,6 +38,7 @@ set -ex echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf sudo systemctl stop packagekit sudo systemctl disable packagekit +sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=0 sudo subscription-manager refresh -- cgit v1.2.3 From acfc7ad18d311922d58890381c23b854c0c5402b Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 31 Jul 2019 12:21:51 +0200 Subject: Fix message "RPMDB altered outside of yum" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit yum install supports a local filename on RHEL 6 or newer. Change-Id: I873ab3dfab56003ded45bc6c4099aae150f423dd Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh | 3 +-- coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh index 21a45506..91097dbf 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh @@ -44,6 +44,5 @@ targetFile="/tmp/$package" DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" -sudo rpm -ivh "$targetFile" +sudo yum -y install "$targetFile" rm "$targetFile" - diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh index 5cdf7df0..0a29d842 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh @@ -46,6 +46,5 @@ targetFile="/tmp/$package" DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" -sudo rpm -ivh "$targetFile" +sudo yum -y install "$targetFile" rm "$targetFile" - -- cgit v1.2.3 From bdc5dae67b8d36d797a42c5e2dc72a1510b81e27 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Mon, 12 Aug 2019 19:14:10 +0200 Subject: Speed up provisioning on Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6e4e5621ed0b063215476ef51d61ef1f38198d0c Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/install_protobuff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh index 59e9b699..a9b2cfd0 100755 --- a/coin/provisioning/common/unix/install_protobuff.sh +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -64,7 +64,7 @@ if uname -a |grep -q Darwin; then else ./configure fi -make +make -j5 sudo make install # Refresh shared library cache if OS isn't macOS -- cgit v1.2.3 From b97df21bef1d6a9deab1c62eaa1cbb8f477819ad Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 14 Aug 2019 15:24:32 +0200 Subject: Brew update only once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6c2650574b6b62ceedfc95a9caab7ca26a6fa10b Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/homebrew.sh | 2 ++ coin/provisioning/common/macos/libiodbc.sh | 1 - coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index a6efe123..f7042de3 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash # Will install homebrew package manager for macOS /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" Date: Thu, 15 Aug 2019 13:55:07 +0200 Subject: Increase open files and processes limit on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If93bbe067f76168a7c131c6ced187f00a8d908e1 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/increase_limits.sh | 72 ++++++++++++++++++++++ .../provisioning/common/macos/limit.maxfiles.plist | 20 ++++++ coin/provisioning/common/macos/limit.maxproc.plist | 20 ++++++ .../qtci-macos-10.12-x86_64/01-increase_limits.sh | 44 +++++++++++++ .../qtci-macos-10.13-x86_64/01-increase_limits.sh | 44 +++++++++++++ .../qtci-macos-10.14-x86_64/01-increase_limits.sh | 44 +++++++++++++ 6 files changed, 244 insertions(+) create mode 100755 coin/provisioning/common/macos/increase_limits.sh create mode 100644 coin/provisioning/common/macos/limit.maxfiles.plist create mode 100644 coin/provisioning/common/macos/limit.maxproc.plist create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh diff --git a/coin/provisioning/common/macos/increase_limits.sh b/coin/provisioning/common/macos/increase_limits.sh new file mode 100755 index 00000000..666d9067 --- /dev/null +++ b/coin/provisioning/common/macos/increase_limits.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + + +# Increase the soft and hard RLIMIT_NOFILE and RLIMIT_NPROC limits. +# By default they are 256/unlimited and 709/1064 +# and they sometimes create problems to the build process and telegraf. + + +# Must have this variable set in the environment +[ x"$PROVISION_DIR" = x ] && exit 38 + + +echo "Current limits are:" +ulimit -a +launchctl limit + +sudo cp $PROVISION_DIR/common/macos/limit.maxfiles.plist /Library/LaunchDaemons/ +sudo cp $PROVISION_DIR/common/macos/limit.maxproc.plist /Library/LaunchDaemons/ + +sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist +sudo chown root:wheel /Library/LaunchDaemons/limit.maxproc.plist + +sudo chmod 644 /Library/LaunchDaemons/limit.maxfiles.plist +sudo chmod 644 /Library/LaunchDaemons/limit.maxproc.plist + +# Activate the new limits immediately (not for the current session though) +sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist +sudo launchctl load -w /Library/LaunchDaemons/limit.maxproc.plist + +echo "After adjusting, limits are:" +ulimit -a +launchctl limit + + +# NOTE: If the limits are not increased enough, it might be because of +# restrictions set by the kernel. They can be temporarily altered with: + +# sudo sysctl -w kern.maxproc=xxxx +# sudo sysctl -w kern.maxprocperuid=xxx diff --git a/coin/provisioning/common/macos/limit.maxfiles.plist b/coin/provisioning/common/macos/limit.maxfiles.plist new file mode 100644 index 00000000..1bf85214 --- /dev/null +++ b/coin/provisioning/common/macos/limit.maxfiles.plist @@ -0,0 +1,20 @@ + + + + + Label + limit.maxfiles + ProgramArguments + + launchctl + limit + maxfiles + 65536 + 524288 + + RunAtLoad + + ServiceIPC + + + diff --git a/coin/provisioning/common/macos/limit.maxproc.plist b/coin/provisioning/common/macos/limit.maxproc.plist new file mode 100644 index 00000000..0c2cc0e9 --- /dev/null +++ b/coin/provisioning/common/macos/limit.maxproc.plist @@ -0,0 +1,20 @@ + + + + + Label + limit.maxproc + ProgramArguments + + launchctl + limit + maxproc + 8192 + 32768 + + RunAtLoad + + ServiceIPC + + + diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..c7bf7a88 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + + +PROVISION_DIR="$(dirname "$0")/.." +export PROVISION_DIR + + +. "$PROVISION_DIR"/common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..c7bf7a88 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + + +PROVISION_DIR="$(dirname "$0")/.." +export PROVISION_DIR + + +. "$PROVISION_DIR"/common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..c7bf7a88 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + + +PROVISION_DIR="$(dirname "$0")/.." +export PROVISION_DIR + + +. "$PROVISION_DIR"/common/macos/increase_limits.sh -- cgit v1.2.3 From c7f87acb3717b3b2231e9ded71e481e82a742596 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Mon, 9 Sep 2019 10:45:47 +0200 Subject: Do not silence standard error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Provisioning was failing and the logs did not provide any useful information because of the silenced squish install command. So I went through all the scripts and I re-enabled stderr logging where I found it silenced (with the exception of where it was purposeful or harmless). Change-Id: I5fa0b0ba4362970b214c150d399b6720b1780e1e Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/disable-ntp_linux.sh | 2 +- coin/provisioning/common/unix/squishInstall.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index c509d36b..dc592553 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -44,5 +44,5 @@ elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then sudo timedatectl set-ntp false else - (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off + sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off fi diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b40c1922..f1b5e6b5 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -122,7 +122,7 @@ function MountAndInstall { sudo cp $targetFileMount /tmp UnMount sudo hdiutil attach "/tmp/$targetFile" - sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null mountFolder="/Volumes/froglogic Squish" UnMount elif [[ $targetFile == *.run ]]; then @@ -130,7 +130,7 @@ function MountAndInstall { sudo cp $targetFileMount $targetDirectory UnMount sudo chmod +x $targetDirectory/$targetFile - sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null sudo rm -fr "$targetDirectory/$targetFile" if uname -a |grep -q "Ubuntu"; then sudo mkdir /usr/lib/tcl8.6 -- cgit v1.2.3 From c0fce7a3b37db53289ffd1e44c58f0bfc0601229 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 11 Sep 2019 19:24:25 +0200 Subject: Refactor DownloadURL.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Auto-detects and verifies all kinds of hashes, not only SHA1. Hash verification is now an autonomous function. If the file is found at the destination, skip redownloading it if the hash is OK. Runs on POSIX sh, not requiring bash. Retain compatibility with previous version. Change-Id: I9930336030aa776f49dc460fe766f3e831700255 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/DownloadURL.sh | 84 ++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 23 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index 996c99da..da6d772f 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -1,8 +1,8 @@ -#!/usr/bin/env bash +#!/bin/sh ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,31 +33,69 @@ ## ############################################################################# + # A helper script used for downloading a file from a URL or an alternative -# URL. Also the SHA1 is checked for the file. Target filename should also -# be given. -# -# If called directly from another script, it will exit the parent script -# as well, if not called in its own subshell with parentheses. +# URL. Also the SHA is checked for the file (SHA algorithm is autodetected +# based on the SHA length). Target filename should also be given. + +############################ BOILERPLATE ############################### +command -v sha1sum >/dev/null || alias sha1sum='shasum -a 1' +command -v sha256sum >/dev/null || alias sha256sum='shasum -a 256' +command -v sha384sum >/dev/null || alias sha384sum='shasum -a 384' +command -v sha512sum >/dev/null || alias sha512sum='shasum -a 512' +######################################################################## + + +VerifyHash () { + file=$1 + expectedHash=$2 + + if [ ! -f "$file" ] + then return 2 # file does not exist + fi -set -ex -function DownloadURL { + hashLength="$(echo "$expectedHash" | wc -c | sed 's/ *//g')" + # Use backticks because of bug with bash-3 (default on macOS), + # caused when there are unbalanced parentheses inside $() + # shellcheck disable=SC2006 + hash=`case "$hashLength" in + 41) sha1sum "$file" ;; + 65) sha256sum "$file" ;; + 97) sha384sum "$file" ;; + 129) sha512sum "$file" ;; + *) echo "FATAL! Unknown hash length: $hashLength" 1>&2 && exit 1 ;; + esac | cut -d ' ' -f 1` + + if [ ! "$expectedHash" = "$hash" ] + then + echo "FAIL! wrong file hash: $file $hash" 1>&2 + return 1 + fi + echo "OK verified integrity of: $file" +} + +# Check if file already exists and is good, otherwise download it +DownloadURL () { url=$1 - url_alt=$2 - expectedSha1=$3 + url2=$2 + expectedHash=$3 targetFile=$4 - echo "Downloading from primary URL '$url'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || { - echo "Failed to download '$url' multiple times" - echo "Downloading from alternative URL '$url_alt'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; } - } - - echo "Checking SHA1 on PKG '$targetFile'" - echo "$expectedSha1 *$targetFile" > "$targetFile.sha1" - sha1sum --check "$targetFile.sha1" - rm -f "$targetFile.sha1" + if VerifyHash "$targetFile" "$expectedHash" + then + echo "Skipping download, found and validated existing file: $targetFile" + else + echo "Downloading from primary URL: $url" + if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" + then + echo "FAIL! to download, trying alternative URL: $url2" 1>&2 + if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url2" + then + echo 'FAIL! to download even from alternative url' 1>&2 + return 1 + fi + fi + VerifyHash "$targetFile" "$expectedHash" + fi } - -- cgit v1.2.3 From fbe3a8d84e943b8e1ff89389bc6af9e09532722a Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 24 Jul 2019 16:17:46 +0200 Subject: Install telegraf on all provisioned VMs Install binaries as early as possible in the provisioning process, and start them, in order to monitor provisioning too. To achieve this, some OS auto-detection logic is introduced in shell script common.sourced.sh. The script can be sourced and used in all kind of other generic scripts. ioping is also installed from custom-compiled binaries in order to monitor the disk latency of the VMs. Reason we don't use ioping from the repositories, is that the units differ between ioping versions (new ioping reports latencies in nanoseconds, old in microseconds). Fixes: QTQAINFRA-3092 Change-Id: I9d9afb791955725d4bd0b32dae97dfc0bd4a76a3 Reviewed-by: Heikki Halmet --- .../linux/devel_languages_go.SUSE_repo_key.pub | 19 +++ coin/provisioning/common/linux/telegraf-coin.conf | 47 +++++++ coin/provisioning/common/macos/telegraf-coin.conf | 51 ++++++++ .../common/shared/telegraf/influxdb.repo_key.pub | 52 ++++++++ .../common/shared/telegraf/telegraf-ioping.sh | 26 ++++ .../shared/telegraf/telegraf_packages.sha256.txt | 6 + coin/provisioning/common/unix/common.sourced.sh | 139 +++++++++++++++++++++ coin/provisioning/common/unix/telegraf_install.sh | 98 +++++++++++++++ coin/provisioning/common/unix/telegraf_password.sh | 60 +++++++++ coin/provisioning/common/windows/helpers.ps1 | 2 +- .../common/windows/install_telegraf.ps1 | 68 ++++++++++ .../provisioning/common/windows/telegraf-coin.conf | 41 ++++++ .../common/windows/telegraf_password.ps1 | 39 ++++++ .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../qtci-macos-10.12-x86_64/26-install_telegraf.sh | 3 + .../qtci-macos-10.13-x86_64/26-install_telegraf.sh | 3 + .../qtci-macos-10.14-x86_64/26-install_telegraf.sh | 3 + .../qtci-windows-10-x86/05-install_telegraf.ps1 | 1 + .../qtci-windows-10-x86_64/05-install_telegraf.ps1 | 1 + .../qtci-windows-7-x86/05-install_telegraf.ps1 | 1 + .../qtci-windows-7-x86_64/05-install_telegraf.ps1 | 1 + .../qtci-windows-8.1-x86/05-install_telegraf.ps1 | 1 + .../05-install_telegraf.ps1 | 1 + 30 files changed, 686 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub create mode 100644 coin/provisioning/common/linux/telegraf-coin.conf create mode 100644 coin/provisioning/common/macos/telegraf-coin.conf create mode 100644 coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub create mode 100644 coin/provisioning/common/shared/telegraf/telegraf-ioping.sh create mode 100644 coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt create mode 100644 coin/provisioning/common/unix/common.sourced.sh create mode 100755 coin/provisioning/common/unix/telegraf_install.sh create mode 100755 coin/provisioning/common/unix/telegraf_password.sh create mode 100644 coin/provisioning/common/windows/install_telegraf.ps1 create mode 100644 coin/provisioning/common/windows/telegraf-coin.conf create mode 100644 coin/provisioning/common/windows/telegraf_password.ps1 create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh create mode 100644 coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 diff --git a/coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub b/coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub new file mode 100644 index 00000000..48162c56 --- /dev/null +++ b/coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQGiBEyvJq8RBAD64FtKbU3VFsZ4PAzcSi9rETc1qXZLVQYtrE38niriIJUuT/tC +kxGjkduD7ozP6rxL+M8fk9UdbbmzhHhXzQT2blyYy2iwpZP5+AFeQawz+oyMRVze +x6IY5qO31TiRu+aEBptk6nco4DULlKABlvtjKI+gJ4buJm+TumyrPaxe9wCgpFwl +O0fEjpOfQd+6Du0sCnPX7+8D/3xYVj9q5ILmrJ9zehBKjRYEcaP0rZVqudH51FUS +I0LQNHsJdzKLzhT+Zj7TJU4KnCN4sX7amfYL3GT9qyZEBDx2alubvEsI36wtNq0i +ewU4XmyZ+Rd7Q4mAPNoBGe5DsUA8wn/7iHGg9aJHu+GXvH7T3DVoUxW5W2KqPw+h +jzqGBACWGuuCefa683uf6aKqpTS3JB+01BDPf+sG9qJ+k7xcJOsEiXIe1X5vH9ov +kEvTM12kzY7SGwlsFsTDT1xioDl62g5nPlZMXErUBVnjoMtjl9bDwUPJY/vP1S9M +VaONBMoJEON3HRui9jhdEK25LTdrcFlFpRzJI3AgdXwy8aQyiLRGZGV2ZWw6bGFu +Z3VhZ2VzOmdvIE9CUyBQcm9qZWN0IDxkZXZlbDpsYW5ndWFnZXM6Z29AYnVpbGQu +b3BlbnN1c2Uub3JnPohmBBMRAgAmBQJc9DoCAhsDBQkUY8NTBgsJCAcDAgQVAggD +BBYCAwECHgECF4AACgkQr0z+TTB9e/lQZgCfXIjj30HyCPvUbSbSd6zOS0seAegA +n3DXayMpRphNmyJgLvl5qKfsX7f6iEYEExECAAYFAkyvJq8ACgkQOzARt2udZSOg +qQCeOba7kjk7CI+64GOkhhTGSdjnjdQAn2IC5tx+PW38XKwl3Jr5YVp0RyR0 +=AOj6 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/coin/provisioning/common/linux/telegraf-coin.conf b/coin/provisioning/common/linux/telegraf-coin.conf new file mode 100644 index 00000000..33a9c6de --- /dev/null +++ b/coin/provisioning/common/linux/telegraf-coin.conf @@ -0,0 +1,47 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 100 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "5s" + precision = "" + logfile = "/var/log/telegraf-coin.log" + hostname = "$COIN_UNIQUE_JOB_ID" + omit_hostname = false +[[outputs.influxdb]] + urls= ["https://qtinfluxdb01.intra.qt.io:8086"] + insecure_skip_verify = true + database = "coin_vms" + skip_database_creation = true + username = "coin_vms_writer" + password = "COIN_VMS_WRITER_PASS" +[[inputs.cpu]] + percpu = true + totalcpu = true + collect_cpu_time = false + report_active = false +[[inputs.disk]] + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] +[[inputs.diskio]] +[[inputs.kernel]] +[[inputs.mem]] +[[inputs.processes]] +[[inputs.swap]] +[[inputs.system]] +[[inputs.kernel_vmstat]] # linux-only +[[inputs.netstat]] + + +# Monitor Coin process +[[inputs.procstat]] + exe = "coin-" + pid_finder = "native" + + +# Monitor I/O latency +[[inputs.exec]] + data_format = "influx" + commands = [ "/usr/bin/telegraf-ioping.sh /" ] diff --git a/coin/provisioning/common/macos/telegraf-coin.conf b/coin/provisioning/common/macos/telegraf-coin.conf new file mode 100644 index 00000000..24440a05 --- /dev/null +++ b/coin/provisioning/common/macos/telegraf-coin.conf @@ -0,0 +1,51 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 100 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "5s" + precision = "" + logfile = "/var/log/telegraf-coin.log" + hostname = "$COIN_UNIQUE_JOB_ID" + omit_hostname = false +[[outputs.influxdb]] + urls= ["https://qtinfluxdb01.intra.qt.io:8086"] + insecure_skip_verify = true + database = "coin_vms" + skip_database_creation = true + username = "coin_vms_writer" + password = "COIN_VMS_WRITER_PASS" +#[[inputs.cpu]] # linux-only +# percpu = true +# totalcpu = true +# collect_cpu_time = false +# report_active = false +[[inputs.disk]] + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] +#[[inputs.diskio]] # linux-only +[[inputs.kernel]] +[[inputs.mem]] +[[inputs.processes]] +[[inputs.swap]] +[[inputs.system]] +#[[inputs.kernel_vmstat]] # linux-only +[[inputs.netstat]] + + +# Monitor Coin process +[[inputs.procstat]] + exe = "coin-" + # Buggy on macOS if using the "native" pid_finder, see: + # https://github.com/influxdata/telegraf/issues/6265 + # Tested 1.12.1 version that "native" pid_finder has been fixed, + # but it is slow and times out frequently + pid_finder = "pgrep" + + +# Monitor I/O latency +[[inputs.exec]] + data_format = "influx" + commands = [ "/usr/bin/telegraf-ioping.sh /" ] diff --git a/coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub b/coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub new file mode 100644 index 00000000..c97d5933 --- /dev/null +++ b/coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFYJmwQBEADCw7mob8Vzk+DmkYyiv0dTU/xgoSlp4SQwrTzat8MB8jxmx60l +QjmhqEyuB8ho4zzZF9KV+gJWrG6Rj4t69JMTJWM7jFz+0B1PC7kJfNM+VcBmkTnj +fP+KJjqz50ETnsF0kQTG++UJeRYjG1dDK0JQNQJAM6NQpIWJI339lcDf15vzrMnb +OgIlNxV6j1ZZqkle4fvScF1NQxYScRiL+sRgVx92SI4SyD/xZnVGD/szB+4OCzah ++0Q/MnNGV6TtN0RiCDZjIUYiHoeT9iQXEONKf7T62T4zUafO734HyqGvht93MLVU +GQAeuyx0ikGsULfOsJfBmb3XJS9u+16v7oPFt5WIbeyyNuhUu0ocK/PKt5sPYR4u +ouPq6Ls3RY3BGCH9DpokcYsdalo51NMrMdnYwdkeq9MEpsEKrKIN5ke7fk4weamJ +BiLI/bTcfM7Fy5r4ghdI9Ksw/ULXLm4GNabkIOSfT7UjTzcBDOvWfKRBLX4qvsx4 +YzA5kR+nX85u6I7W10aSqBiaLqk6vCj0QmBmCjlSeYqNQqSzH/6OoL6FZ7lP6AiG +F2NyGveJKjugoXlreLEhOYp20F81PNwlRBCAlMC2Q9mpcFu0dtAriVoG4gVDdYn5 +t+BiGfD2rJlCinYLgYBDpTPcdRT3VKHWqL9fcC4HKmic0mwWg9homx550wARAQAB +tDFJbmZsdXhEQiBQYWNrYWdpbmcgU2VydmljZSA8c3VwcG9ydEBpbmZsdXhkYi5j +b20+iQI3BBMBCgAhBQJWCZsEAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJ +EGhKFM8lguDF9XEQAK9rREnZt6ujh7GXfeNki35bkn39q8GYh0mouShFbFY9o0i3 +UJVChsxokJSRPgFh9GOhOPTupl3rzfdpD+IlWI2Myt6han2HOjZKNZ4RGNrYJ5UR +uxt4dKMWlMbpkzL56bhHlx97RoXKv2d2zRQfw9nyZb6t3lw2k2kKXsMxjGa0agM+ +2SropwYOXdtkz8UWaGd3LYxwEvW3AuhI8EEEHdLetQaYe9sANDvUEofgFbdsuICH +9QLmbYavk7wyGTPBKfPBbeyTxwW2rMUnFCNccMKLm1i5NpZYineBtQbX2cfx9Xsk +1JLOzEBmNal53H2ob0kjev6ufzOD3s8hLu4KMCivbIz4YT3fZyeExn0/0lUtsQ56 +5fCxE983+ygDzKsCnfdXqm3GgjaI90OkNr1y4gWbcd5hicVDv5fD3TD9f0GbpDVw +yDz8YmvNzxMILt5Glisr6aH7gLG/u8jxy0D8YcBiyv5kfY4vMI2yXHpGg1cn/sVu +ZB01sU09VVIM2BznnimyAayI430wquxkZCyMx//BqFM1qetIgk1wDZTlFd0n6qtA +fDmXAC4s5pM5rfM5V57WmPaIqnRIaESJ35tFUFlCHfkfl/N/ribGVDg1z2KDW08r +96oEiIIiV4GfXl+NprJqpNS3Cn+aCXtd7/TsDScDEgs4sMaR29Lsf26cuWk8uQIN +BFYJmwQBEADDPi3fmwn6iwkiDcH2E2V31cHlBw9OdJfxKVUdyAQEhTtqmG9P8XFZ +ERRQF155XLQPLvRlUlq7vEYSROn5J6BAnsjdjsH9LmFMOEV8CIRCRIDePG/Mez2d +nIK5yiU6GkS3IFaQg2T9/tOBKxm0ZJPfqTXbT4jFSfvYJ3oUqc+AyYxtb8gj1GRk +X283/86/bA3C98u7re1vPtiDRyM8r0+lhEc59Yx/EAOL+X2gZyTgyUoH+LLuOWQK +s1egI8y80R8NZfM1nMiQk2ywMsTFwQjSVimScvzqv5Nt8k8CvHUQ3a6R+6doXGNX +5RnUqn9Qvmh0JY5sNgFsoaGbuk2PJrVaGBRnfnjaDqAlZpDhwkWhcCcguNhRbRHp +N7/a0pQr70bAG9VikzLyGC17EU0sxney/hyNHkr4Uyy2OXHpuJvRjVKy/BwZ3fxA +AYX2oZIOxQB3/OulzO/DppaCVhRtp1bt+Z5f+fpisiVb5DvZcMdeyAoQ4+oOr7v3 +EasIs2XYcQ+kOE3Y2kdlHWBeuXzxgWgJZ1OOpwGMjR3Uy6IwhuSWtreJBA4er+Df +vgSPwKBsRLNLbPe3ftjArnC5GfMiGgikVdAUdN4OkEqvUbkRoAVGKTOMLUKm+ZkG +OskJOVYS+JAina0qkYEFF7haycMjf9olhqLmTIC+6X7Ox9R2plaOhQARAQABiQIf +BBgBCgAJBQJWCZsEAhsMAAoJEGhKFM8lguDF8ZIP/1q9Sdz8oMvf9AJXZ7AYxm77 +V+kJzJqi62nZLWJnrFXDZJpU+LkYlb3fstsZ1rvBhnrEPSmFxoj72CP0RtcyX7wJ +dA7K1Fl9LpJi5H8300cC7UyG94MUYbrXijbLTbnFTfNr1tGx4a1T/7Yyxx/wZGrT +H/X8cvNybkl33SxDdlQQ9kx3lFOwC41e3TkGsUWxn3TCfvDh8VdA6Py6JeSPFGOb +MEO2/q7oUgvjfV+ivN5ayZi9bWgeqm1sgtmTHHQ4RqwwKrAb5ynXpn1b9QrkevgT +b91uzMA22Prl4DuzKiaMYDcZOQ3vtf0eFBP0GOSSgUKS4bQ3dGgi1JmQ7VuAM4uj ++Ug5TnGoLwclTwLksc7v89C5MMPgm2vVXvCUDzyzQA7bIHFeX+Rziby4nymec4Nr +eeXYNBJWrEp8XR7UNWmEgroXRoN1x9/6esh5pnoUXGAIWuKzSLQM70/wWxS67+v2 +aC1GNb+pXXAzYeIIiyLWaZwCSr8sWMvshFT9REk2+lnb6sAeJswQtfTUWI00mVqZ +dvI3Wys2h0IyIejuwetTUvGhr9VgpqiLLfGzGlt/y2sg27wdHzSJbMh0VrVAK26/ +BlvEwWDCFT0ZJUMG9Lvre25DD0ycbougLsRYjzmGb/3k3UktS3XTCxyBa/k3TPw3 +vqIHrEqk446nGPDqJPS5 +=9iF7 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/coin/provisioning/common/shared/telegraf/telegraf-ioping.sh b/coin/provisioning/common/shared/telegraf/telegraf-ioping.sh new file mode 100644 index 00000000..ad95eadc --- /dev/null +++ b/coin/provisioning/common/shared/telegraf/telegraf-ioping.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +# Measure I/O latency once, return data in InfluxDB format +# +# Run one ioping command for read, and one for write. +# Each one sends 3 requests and reports the minimum time, in nanoseconds. +# (Because of limitations of ioping, we can't just send one request and get +# the number back in the batch format. Additionally, the number seems to be +# fluctuating quite a bit so taking the smallest number out of 3 requests is +# stabilising it a bit.) + + +set -e + +[ x"$1" = x ] && echo "$0 takes a path as a first argument" && exit 1 + +# Try to run in high priority to avoid slow-downs because of +# factors other than I/O. +renice -n -10 -p $$ >/dev/null 2>&1 || true + + +rlatency="$(ioping -B -k -c 3 -i 0.1 "$1" | cut -d " " -f 5)" +wlatency="$(ioping -B -k -c 3 -i 0.1 -W "$1" | cut -d " " -f 5)" + +printf "ioping,path=$1 read_latency_ns=%u,write_latency_ns=%u\n" \ + $rlatency $wlatency diff --git a/coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt b/coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt new file mode 100644 index 00000000..7d1cdada --- /dev/null +++ b/coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt @@ -0,0 +1,6 @@ +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_windows_i386.zip d2dea67a28fd7a9e21395d14f0b7ce1b6413e85cc9ffd89cc7ff8f35e8af5837 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_windows_amd64.zip 88d8c8146b561f43726e61688b42d0b5ab88fc22607b94df5a2c8245bbb27e29 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_darwin_amd64.tar.gz 58a2b294c1b6408c396b5526719cf7cad557f7075fed10ff0b2a74141ea2d629 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_linux_amd64.tar.gz 070a76800d1a5f33413b8948286f75caa55ebd924f6fb6996a753b9979799ef5 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_linux_i386.tar.gz 964077b6846708f579a100d7ea6090e2d8350ace75ec735d539bc452bc551038 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1-static_linux_amd64.tar.gz bb03814c99c037ce0758e3884660910f2f6fd78f3d49a8e1ef531693b3cfe25d diff --git a/coin/provisioning/common/unix/common.sourced.sh b/coin/provisioning/common/unix/common.sourced.sh new file mode 100644 index 00000000..a52880b2 --- /dev/null +++ b/coin/provisioning/common/unix/common.sourced.sh @@ -0,0 +1,139 @@ +#!/bin/sh + + +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + + +# Script to be sourced from everywhere you need a common environment. Defines: +export PROVISIONING_DIR +export PROVISIONING_OS +export PROVISIONING_OS_ID +export PROVISIONING_ARCH +export CMD_PKG_INSTALL +export CMD_PKG_LOCALINSTALL +export CMD_INSTALL + + + +if [ x"$IS_PROVISIONING_COMMON_SOURCED" != x ] +then + echo "common.sourced.sh has already been sourced, re-sourcing skipped" + return +fi + +# Do not export; you want children to re-source, because they only inherit the +# variables but not the functions +IS_PROVISIONING_COMMON_SOURCED=1 + + +fatal () { + echo "$1" 1>&2 + if [ x"$2" != x ] + then exit "$2" + else exit + fi +} + +is_script_executed () { + [ x"$(basename "$0")" = x"$1" ] +} + + +is_script_executed common.sourced.sh \ + && fatal "Script common.sourced.sh should always be sourced, not executed" + + +set_common_environment () { + # Unfortunately we can't find the provisioning directory from a sourced + # script in a portable way + # PROVISIONING_DIR="$(dirname "$0")/../../" + + [ x"$PROVISIONING_DIR" = x ] \ + && fatal "PROVISIONING_DIR variable needs to be set before calling set_common_environment" + + uname_s="$(uname -s)" + case "$uname_s" in + Linux) + PROVISIONING_OS=linux + . /etc/os-release + PROVISIONING_OS_ID="$ID" + case "$PROVISIONING_OS_ID" in + suse|sles|opensuse*) + CMD_PKG_INSTALL="sudo zypper -nq install" + CMD_PKG_LOCALINSTALL="sudo zypper --no-gpg-checks -nq install" + ;; + debian|ubuntu) + CMD_PKG_INSTALL="sudo apt -y install" + CMD_PKG_LOCALINSTALL="sudo apt -y install" + ;; + rhel|centos|fedora) + CMD_PKG_INSTALL="sudo yum -y install" + CMD_PKG_LOCALINSTALL="sudo yum -y --nogpgcheck localinstall" + ;; + *) fatal "Unknown ID in /etc/os-release: $PROVISIONING_OS_ID" ;; + esac + ;; + Darwin) + PROVISIONING_OS=macos + PROVISIONING_OS_ID=macos + CMD_PKG_INSTALL="brew install" + CMD_PKG_LOCALINSTALL="echo 'TODO how to install a package file on macOS'" + ;; + *) + fatal "Unknown system in uname: $uname_s" 42 + ;; + esac + + uname_m="$(uname -m)" + case "$uname_m" in + x86_64|amd64) PROVISIONING_ARCH=amd64 ;; + i[3456]86) PROVISIONING_ARCH=x86 ;; + *) fatal "Unknown architecture in uname: $uname_m" 43 ;; + esac + + CMD_INSTALL="sudo install" +} + +set_common_environment + +set_dry_run () { + if [ x"$PROVISIONING_DRY_RUN" != x ] + then + CMD_PKG_INSTALL="echo DRYRUN: $CMD_PKG_INSTALL" + CMD_PKG_LOCALINSTALL="echo DRYRUN: $CMD_PKG_LOCALINSTALL" + CMD_INSTALL="echo DRYRUN: $CMD_INSTALL" + fi +} + +set_dry_run diff --git a/coin/provisioning/common/unix/telegraf_install.sh b/coin/provisioning/common/unix/telegraf_install.sh new file mode 100755 index 00000000..1412650e --- /dev/null +++ b/coin/provisioning/common/unix/telegraf_install.sh @@ -0,0 +1,98 @@ +#!/bin/sh + +############################################################################# +## +## Copyright (C) 2019 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 telegraf and ioping and our script telegraf-ioping.sh +# to the /usr/bin directory. +# +# The reasons we don't install to /usr/local/bin are: +# 1. On SLES and RHEL, the PATH of sudo (secure_path setting in /etc/sudoers) +# does not include /usr/local/bin. +# 2. On macOS /usr/local/bin does not even exist early in provisioning. + + +######################## BOILERPLATE ########################### +set -e + + +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh + +. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh + +is_script_executed telegraf_install.sh \ + || fatal "Script telegraf_install.sh should be executed, not sourced" + +################################################################ + + +[ "$PROVISIONING_OS" = linux ] \ + && ioping_sha256=259abf04bcb84f4126ff97c04b6651e1cf5ea6d8a9ff364c769a26c95b6eeb44 \ + || ioping_sha256=55de6a2f1a5343e0ce8df31d82d47a9e79c7e612edbc6dfb39b5fc6fb358b2e3 +DownloadURL "http://ci-files01-hki.intra.qt.io/input/ioping/ioping.${PROVISIONING_OS}-${PROVISIONING_ARCH}" \ + '' "$ioping_sha256" ioping +$CMD_INSTALL -m 755 ./ioping /usr/bin/ +rm -f ioping + +# 2. Install custom ioping monitoring script +$CMD_INSTALL -m 755 "$PROVISIONING_DIR"/common/shared/telegraf/telegraf-ioping.sh /usr/bin/ + +# 3. Download and install telegraf + +[ x"$PROVISIONING_OS" = xmacos ] && os=darwin || os=linux +[ x"$PROVISIONING_ARCH" = xx86 ] && arch=i386 || arch=amd64 +package_filename=telegraf-1.12.1_${os}_${arch}.tar.gz +package_sha256_list="$PROVISIONING_DIR"/common/shared/telegraf/telegraf_packages.sha256.txt +package_sha256=$(sed -n "s/.*$package_filename *//p" "$package_sha256_list") + +DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/telegraf/"$package_filename" \ + https://dl.influxdata.com/telegraf/releases/"$package_filename" \ + "$package_sha256" \ + telegraf.tar.gz + +tar -xzf ./telegraf.tar.gz -C /tmp +telegraf_binary=$(find /tmp/telegraf* -name telegraf -type f | grep /bin/ | head -1) +$CMD_INSTALL -m 755 "$telegraf_binary" /usr/bin/ +rm -rf /tmp/telegraf* + +# 4. Edit config file with passwords +"$PROVISIONING_DIR"/common/unix/telegraf_password.sh + +# 5. Start telegraf in background (-b) and with retaining the environment (-E) +# in order to report as hostname = $COIN_UNIQUE_JOB_ID. +/usr/bin/sudo -b -E telegraf --config /etc/telegraf-coin.conf >/dev/null 2>&1 + +echo DONE: "Installed and started telegraf: $package_filename" diff --git a/coin/provisioning/common/unix/telegraf_password.sh b/coin/provisioning/common/unix/telegraf_password.sh new file mode 100755 index 00000000..efbed142 --- /dev/null +++ b/coin/provisioning/common/unix/telegraf_password.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + + +######################## BOILERPLATE ########################### +set -e + + +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh + +is_script_executed telegraf_password.sh \ + || fatal "Script telegraf_password.sh should be executed, not sourced, to avoid leaking secrets in the logs" +# Avoid leaking secrets in the logs +set +x +################################################################ + + +# Provisioning should run even without the secrets repository +influxdb_password=$(cut -d : -f 2 ~qt/work/influxdb/coin_vms_writer.auth) \ + || influxdb_password=no_password_provided + +rm -f ~qt/work/influxdb/coin_vms_writer.auth +sed "s|COIN_VMS_WRITER_PASS|$influxdb_password|" \ + "$PROVISIONING_DIR"/common/"$PROVISIONING_OS"/telegraf-coin.conf \ + > .telegraf-coin.conf.final +$CMD_INSTALL -m 600 .telegraf-coin.conf.final /etc/telegraf-coin.conf +rm -f .telegraf-coin.conf.final diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 0f39beed..3ccb42ac 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -3,7 +3,7 @@ function Verify-Checksum Param ( [string]$File=$(throw("You must specify a filename to get the checksum of.")), [string]$Expected=$(throw("Checksum required")), - [ValidateSet("sha1","md5")][string]$Algorithm="sha1" + [ValidateSet("sha256","sha1","md5")][string]$Algorithm="sha1" ) Write-Host "Verifying checksum of $File" $fs = new-object System.IO.FileStream $File, "Open" diff --git a/coin/provisioning/common/windows/install_telegraf.ps1 b/coin/provisioning/common/windows/install_telegraf.ps1 new file mode 100644 index 00000000..258c6c59 --- /dev/null +++ b/coin/provisioning/common/windows/install_telegraf.ps1 @@ -0,0 +1,68 @@ +############################################################################# +## +## Copyright (C) 2019 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\windows\helpers.ps1" + + +# Install a specific version of Telegraf +# https://github.com/influxdata/telegraf/releases + +$version = "1.12.1" + +if (Is64BitWinHost) { + $arch = "amd64" + $sha256 = "88d8c8146b561f43726e61688b42d0b5ab88fc22607b94df5a2c8245bbb27e29" +} else { + $arch = "i386" + $sha256 = "d2dea67a28fd7a9e21395d14f0b7ce1b6413e85cc9ffd89cc7ff8f35e8af5837" +} + +$filename = "telegraf-" + $version + "_windows_" + $arch + ".zip" + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $filename +$url_official = "https://dl.influxdata.com/telegraf/releases/" + $filename +$tempfile = "C:\Windows\Temp\" + $filename + +Write-Host "Fetching Telegraf $version..." +Download $url_official $url_cache $tempfile +Verify-Checksum $tempfile $sha256 sha256 + +Write-Host "Installing telegraf.exe under C:\Utils\telegraf" +Extract-7Zip $tempfile C:\Utils "telegraf" +Copy-Item "$PSScriptRoot\..\..\common\windows\telegraf-coin.conf" C:\telegraf-coin.conf + +. "$PSScriptRoot\telegraf_password.ps1" + +Start-Process -FilePath C:\Utils\telegraf\telegraf.exe -ArgumentList "--config C:\telegraf-coin.conf" + +Write-Output "Telegraf = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/telegraf-coin.conf b/coin/provisioning/common/windows/telegraf-coin.conf new file mode 100644 index 00000000..9a4d22e8 --- /dev/null +++ b/coin/provisioning/common/windows/telegraf-coin.conf @@ -0,0 +1,41 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 100 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "5s" + precision = "" + logfile = "C:\\telegraf-coin.log" + hostname = "$COIN_UNIQUE_JOB_ID" + omit_hostname = false +[[outputs.influxdb]] + urls= ["https://qtinfluxdb01.intra.qt.io:8086"] + insecure_skip_verify = true + database = "coin_vms" + skip_database_creation = true + username = "coin_vms_writer" + password = "COIN_VMS_WRITER_PASS" +[[inputs.cpu]] + percpu = true + totalcpu = true + collect_cpu_time = false + report_active = false +[[inputs.disk]] + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] +[[inputs.diskio]] +[[inputs.kernel]] +[[inputs.mem]] +#[[inputs.processes]] +[[inputs.swap]] +[[inputs.system]] +#[[inputs.kernel_vmstat]] # linux-only +[[inputs.netstat]] + + +# Monitor Coin process +[[inputs.procstat]] + exe = "coin-" + pid_finder = "native" diff --git a/coin/provisioning/common/windows/telegraf_password.ps1 b/coin/provisioning/common/windows/telegraf_password.ps1 new file mode 100644 index 00000000..11d04dbc --- /dev/null +++ b/coin/provisioning/common/windows/telegraf_password.ps1 @@ -0,0 +1,39 @@ +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + + +$colon_file = Get-Content "C:\Users\qt\work\influxdb\coin_vms_writer.auth" +$influxdb_password = $colon_file.Substring($colon_file.LastIndexOf(':') + 1) +$telegraf_conf = "C:\telegraf-coin.conf" +(Get-Content $telegraf_conf) | ForEach-Object { $_.Replace("COIN_VMS_WRITER_PASS", $influxdb_password) } | Out-File -Encoding UTF8 $telegraf_conf +Remove-Item "C:\Users\qt\work\influxdb\coin_vms_writer.auth" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" -- cgit v1.2.3 From 89f6db8c2232b543aaebfe1ba8d9ba8d3a7fc177 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 12 Sep 2019 01:12:18 +0200 Subject: Adjust pre-existing script to use the new common.sourced.sh Change-Id: Icf7829d3499110a76b90679ba2d067f80d189e69 Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/increase_limits.sh | 18 ++++----- .../qtci-macos-10.12-x86_64/01-increase_limits.sh | 45 +--------------------- .../qtci-macos-10.13-x86_64/01-increase_limits.sh | 45 +--------------------- .../qtci-macos-10.14-x86_64/01-increase_limits.sh | 45 +--------------------- 4 files changed, 14 insertions(+), 139 deletions(-) diff --git a/coin/provisioning/common/macos/increase_limits.sh b/coin/provisioning/common/macos/increase_limits.sh index 666d9067..040c55e8 100755 --- a/coin/provisioning/common/macos/increase_limits.sh +++ b/coin/provisioning/common/macos/increase_limits.sh @@ -39,22 +39,20 @@ # and they sometimes create problems to the build process and telegraf. -# Must have this variable set in the environment -[ x"$PROVISION_DIR" = x ] && exit 38 +set -e + +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh echo "Current limits are:" ulimit -a launchctl limit -sudo cp $PROVISION_DIR/common/macos/limit.maxfiles.plist /Library/LaunchDaemons/ -sudo cp $PROVISION_DIR/common/macos/limit.maxproc.plist /Library/LaunchDaemons/ - -sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist -sudo chown root:wheel /Library/LaunchDaemons/limit.maxproc.plist - -sudo chmod 644 /Library/LaunchDaemons/limit.maxfiles.plist -sudo chmod 644 /Library/LaunchDaemons/limit.maxproc.plist +$CMD_INSTALL -m 644 -o root -g wheel \ + $PROVISIONING_DIR/common/macos/limit.maxfiles.plist \ + $PROVISIONING_DIR/common/macos/limit.maxproc.plist \ + /Library/LaunchDaemons/ # Activate the new limits immediately (not for the current session though) sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh index c7bf7a88..08669e52 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh @@ -1,44 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -############################################################################# -## -## Copyright (C) 2019 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 - - -PROVISION_DIR="$(dirname "$0")/.." -export PROVISION_DIR - - -. "$PROVISION_DIR"/common/macos/increase_limits.sh +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh index c7bf7a88..08669e52 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh @@ -1,44 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -############################################################################# -## -## Copyright (C) 2019 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 - - -PROVISION_DIR="$(dirname "$0")/.." -export PROVISION_DIR - - -. "$PROVISION_DIR"/common/macos/increase_limits.sh +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh index c7bf7a88..08669e52 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh @@ -1,44 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -############################################################################# -## -## Copyright (C) 2019 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 - - -PROVISION_DIR="$(dirname "$0")/.." -export PROVISION_DIR - - -. "$PROVISION_DIR"/common/macos/increase_limits.sh +"$(dirname "$0")"/../common/macos/increase_limits.sh -- cgit v1.2.3 From 8f4c12bc03f2617d499c45b342474eef7337f1a0 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 20 Sep 2019 00:16:28 +0200 Subject: Install 7-zip at the beginning of provisioning Windows so that we can extract zip files early and install telegraf. Also moved disabling Windows defender, to keep it at the very beginning of provisioning. Change-Id: I6c2039ebd20e541bdd7d437dd56ccb06a1619a5f Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 | 1 - coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 | 1 - coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/00-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 | 1 - coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 | 1 - coin/provisioning/qtci-windows-7-x86/00-disable-windefender.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/00-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 | 1 - coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 | 1 - coin/provisioning/qtci-windows-7-x86_64/00-disable-windefender.ps1 | 1 + coin/provisioning/qtci-windows-7-x86_64/00-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 | 1 - coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86/00-disable-windefender.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86_64/00-disable-windefender.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/00-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 | 1 - 24 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/00-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/00-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/00-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/00-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/00-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/00-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/00-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/00-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 new file mode 100644 index 00000000..8f94b3d5 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 new file mode 100644 index 00000000..8f94b3d5 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/00-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/00-disable-windefender.ps1 new file mode 100644 index 00000000..8f94b3d5 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/00-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/00-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86/00-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/00-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86_64/00-disable-windefender.ps1 new file mode 100644 index 00000000..8f94b3d5 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/00-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/00-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86_64/00-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/00-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-disable-windefender.ps1 new file mode 100644 index 00000000..8f94b3d5 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/00-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-windefender.ps1 new file mode 100644 index 00000000..8f94b3d5 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/00-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/00-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" -- cgit v1.2.3 From 4e3a0f79fbe8bea7915b267e132ba1e0d4b67733 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 20 Sep 2019 13:00:12 +0200 Subject: DownloadURL now works with either wget or curl The reason is that Ubuntu does not have curl at the very beginning of provisioning scripts, and also does not have the repositories configured in order to install it. Change-Id: Ia485c1672f894bc800f199b742d238b2945938e5 Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/DownloadURL.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index da6d772f..0579451f 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -46,6 +46,15 @@ command -v sha512sum >/dev/null || alias sha512sum='shasum -a 512' ######################################################################## +Download () { + url="$1" + targetFile="$2" + + command -v curl >/dev/null \ + && curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" \ + || wget --tries 5 -O "$targetFile" "$url" +} + VerifyHash () { file=$1 expectedHash=$2 @@ -87,10 +96,10 @@ DownloadURL () { echo "Skipping download, found and validated existing file: $targetFile" else echo "Downloading from primary URL: $url" - if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" + if ! Download "$url" "$targetFile" then echo "FAIL! to download, trying alternative URL: $url2" 1>&2 - if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url2" + if ! Download "$url" "$targetFile" then echo 'FAIL! to download even from alternative url' 1>&2 return 1 -- cgit v1.2.3 From de56775c32e82435738ceb96e75e9e0de17b8b68 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 19 Sep 2019 22:07:15 +0200 Subject: Move telegraf install to start of provisioning windows Change-Id: Icf4f213be5a33ec2ad89d514b9bba5d4a3587117 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 | 1 - coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 | 1 - coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 | 1 - coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 | 1 + coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 | 1 - 12 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 deleted file mode 100644 index 77fa8cbf..00000000 --- a/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 deleted file mode 100644 index 77fa8cbf..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 deleted file mode 100644 index 77fa8cbf..00000000 --- a/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 deleted file mode 100644 index 77fa8cbf..00000000 --- a/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 deleted file mode 100644 index 77fa8cbf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 deleted file mode 100644 index 77fa8cbf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" -- cgit v1.2.3 From c4e14a59ecb1c47f4aa3d2fb726ec37384a7eb3b Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 19 Sep 2019 22:10:49 +0200 Subject: Move telegraf install to start of provisioning linux Change-Id: Ia42b0c21f6e341a941e98d3abbda512cfb0fda92 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh | 3 --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh | 3 --- coin/provisioning/qtci-linux-SLES-12-x86_64/01-install_telegraf.sh | 3 +++ coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh | 3 --- coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh | 3 +++ coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh | 3 --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh | 3 --- .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh | 3 +++ .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh | 3 --- .../provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh | 3 +++ .../provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh | 3 --- .../qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh | 3 +++ .../qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh | 3 --- 16 files changed, 24 insertions(+), 24 deletions(-) create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh -- cgit v1.2.3 From 842b72e0803af40d35467540c612370a2e15f15a Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 19 Sep 2019 22:11:45 +0200 Subject: Move telegraf install to start of provisioning macos Change-Id: Ied2b7a415abe5e101b6bfb60472b74070debe9e9 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh | 3 --- coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh | 3 +++ coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh | 3 --- coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh | 3 +++ coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh | 3 --- 6 files changed, 9 insertions(+), 9 deletions(-) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh delete mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh -- cgit v1.2.3 From ec613d93e5002b802979d07980d5fe23b95f3a8d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Sep 2019 23:31:05 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: I1e6126cbe20e293bc4ec88a492c0bf9ebfffd766 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 7b7d3cbb..bd3aa578 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7b7d3cbb23eab884577f2341deb25bdd36c4cae6 +Subproject commit bd3aa578b8d822840fc3d4a6ef819b29b2c26034 diff --git a/qtbase b/qtbase index 94788314..21d988a1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 947883141d9d8b3079a8a21981ad8a5ce3c4798e +Subproject commit 21d988a199d0b4296d481d119ffec2c1253a584f diff --git a/qtconnectivity b/qtconnectivity index d3ace860..7390de23 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d3ace86011d4e34eeafa795270ac027afd54f857 +Subproject commit 7390de230e3c86049824bef756e4af623a547d61 diff --git a/qtdeclarative b/qtdeclarative index 36be2726..a0ad2cbd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 36be27265d61c76b25417a25e482030e30ff380f +Subproject commit a0ad2cbdf27d0d23727b09609e127ac17e414a22 diff --git a/qtdoc b/qtdoc index 21d65d5c..4a69e417 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 21d65d5c2dbfadb3e6dae0707f2ba6e0d4bb2c30 +Subproject commit 4a69e417041370cc7a911da19497fbdd9537f16d diff --git a/qtmultimedia b/qtmultimedia index bf6ac0f0..5155d1af 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bf6ac0f0df5510aa65ecd9bb050bd13d47089d4a +Subproject commit 5155d1afb36a44a3916cce1abf124c67f9cb4700 diff --git a/qtqa b/qtqa index 8cafe2ce..be52132d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8cafe2ce3fd9302b29cb8cbfc93414cc6fc7d83c +Subproject commit be52132dd5b59cec45eb93f09d20211df990596e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d39a6d80..100550dd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d39a6d80f63414a4e933ac2f859805635850942a +Subproject commit 100550dd22dc8eaa47405cdb3e7e461edb01a7a3 diff --git a/qttools b/qttools index 488f2454..c8e79294 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 488f24540d087ae98fff4b3a4de82bdf9acbc72c +Subproject commit c8e79294237260d735324663932a676d8084efcb diff --git a/qtwebengine b/qtwebengine index e31acc86..b44ed0fb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e31acc86e991d6f83bd56eebb7371914fc9ca5ac +Subproject commit b44ed0fb99cd3d7047fcd322010c27cfa7989a18 -- cgit v1.2.3 From 317fbf92434e54c6243325b29e6e28d54cb7c219 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 29 Sep 2019 23:31:03 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: I0738664f8f0129431b7e5c212fe1615b09792aec Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 21d988a1..46201f0e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 21d988a199d0b4296d481d119ffec2c1253a584f +Subproject commit 46201f0e82a7b1629adad196dfa8f7ff1cf4dffd diff --git a/qtdoc b/qtdoc index 4a69e417..b5298436 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4a69e417041370cc7a911da19497fbdd9537f16d +Subproject commit b52984369df0ba311a7f7106086d30a799e3bb61 diff --git a/qtqa b/qtqa index be52132d..e50ae95c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit be52132dd5b59cec45eb93f09d20211df990596e +Subproject commit e50ae95cdfd5a4967708b99ad7ff803f62cd623a -- cgit v1.2.3 From f4e7c08e82652161afa4568dbccf94c7576f775b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 30 Sep 2019 23:30:57 +0200 Subject: Update submodules on '5.13' in qt/qt5 Change-Id: I328c1cb350e067765b0f05e75179cf178dd2b14e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index bd3aa578..c40cccb0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bd3aa578b8d822840fc3d4a6ef819b29b2c26034 +Subproject commit c40cccb0b4485045db61c2d4e825e33a68c58861 diff --git a/qtlocation b/qtlocation index 720beeb3..118dac89 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 720beeb3f768af5e89538dfe0429e31138e84e3c +Subproject commit 118dac89625a8f713bb12e7e9f30bc37b10754b7 diff --git a/qtmultimedia b/qtmultimedia index 5155d1af..545959e4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5155d1afb36a44a3916cce1abf124c67f9cb4700 +Subproject commit 545959e45ec86c70617f4839d20d931297c30c20 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 100550dd..83fbf44b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 100550dd22dc8eaa47405cdb3e7e461edb01a7a3 +Subproject commit 83fbf44b980c4a072ede122f2f16921bfff8c08d -- cgit v1.2.3 From cfef857815392831dc15075c98c53041689a01a4 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 14 Aug 2019 15:52:56 +0200 Subject: Reduce noise in the provision logs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reduce verbosity in order to shorten logs and make them more readable. In two cases we just remove the verbose flag. In one other case we undo inlining of a huge script in the command line. Because we run the provisioning scripts in trace mode, this caused the script to be logged, and it was rather long and meaningless since it comes from an external project. Change-Id: I078ee3b3ab2db9425204375deb5815b6526a4466 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/qnx_660.sh | 2 +- coin/provisioning/common/macos/homebrew.sh | 11 +++++++++-- coin/provisioning/common/macos/install-commandlinetools.sh | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh index 2add6901..eb6fd5f0 100755 --- a/coin/provisioning/common/linux/qnx_660.sh +++ b/coin/provisioning/common/linux/qnx_660.sh @@ -49,7 +49,7 @@ echo "$sha1 $targetFile" | sha1sum --check if [ ! -d "$targetFolder" ]; then mkdir -p $targetFolder fi -sudo tar -C $targetFolder -xvzf $targetFile +sudo tar -C $targetFolder -xzf $targetFile sudo chown -R qt:users "$targetFolder"/"$folderName" # Verify that we have last file in tar diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index f7042de3..715477c0 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -1,5 +1,12 @@ #!/usr/bin/env bash -# Will install homebrew package manager for macOS -/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"