From d0552ebf2d401944d3e263000e23ca41a060d00c Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 6 Dec 2016 18:59:10 +0100 Subject: [PATCH 1/9] Fix macOS provisioning not shutting down cleanly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After provisioning we want the machine to be sensibly shut down since we will use the disk image later. VSphere doesn't manage to shut down 10.8 VMs. Help out by calling shutdown. For the other OS X/macOS versions, this is also desirable since controlling the power state of these machines is hard with different virtualization solutions (we're looking at OpenNebula/KVM). Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- .../provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh | 8 ++++++++ .../provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh | 8 ++++++++ coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh | 10 ++++++++++ coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh | 8 ++++++++ 4 files changed, 34 insertions(+) create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh create mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh create mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh new file mode 100644 index 00000000..1f17b545 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make sure to shut down the machine cleanly when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh new file mode 100644 index 00000000..1f17b545 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make sure to shut down the machine cleanly when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh new file mode 100644 index 00000000..73e5efa7 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# OS X 10.8 and VMWare tools don't play well together. +# The shutdown command fails, so just shut down the machine +# manually when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh new file mode 100644 index 00000000..1f17b545 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make sure to shut down the machine cleanly when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 From 3718450891310a2186c0328415d14f0deaf34649 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 5 Dec 2016 16:21:46 +0100 Subject: [PATCH 2/9] Fix paths for provisioning on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The directory names were missing the architecture, otherwise the content was unused. Change-Id: I0316da5c4b1352012f27ce330c3319a8aedf01ea Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki --- .../001-crashreporter.sh} | 0 .../001-crashreporter.sh} | 0 .../001-crashreporter.sh} | 0 .../001-crashreporter.sh} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/{qtci-osx-10.10/crashreporter.sh => qtci-osx-10.10-x86_64/001-crashreporter.sh} (100%) rename coin/provisioning/{qtci-osx-10.11/crashreporter.sh => qtci-osx-10.11-x86_64/001-crashreporter.sh} (100%) rename coin/provisioning/{qtci-osx-10.8/crashreporter.sh => qtci-osx-10.8-x86_64/001-crashreporter.sh} (100%) rename coin/provisioning/{qtci-osx-10.9/crashreporter.sh => qtci-osx-10.9-x86_64/001-crashreporter.sh} (100%) diff --git a/coin/provisioning/qtci-osx-10.10/crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10/crashreporter.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.11/crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11/crashreporter.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.8/crashreporter.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.8/crashreporter.sh rename to coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.9/crashreporter.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.9/crashreporter.sh rename to coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh From be37958406f92ac78b5d3d5d00b0844c80cbd9bf Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Dec 2016 14:09:25 +0100 Subject: [PATCH 3/9] Disable the screensaver on macOS definitely and permanently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8856eebfe91b9e1cc2cc318a1e7ea80348f1486e Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki --- .../qtci-osx-10.10-x86_64/002-disable-screensaver.sh | 3 +++ .../qtci-osx-10.11-x86_64/002-disable-screensaver.sh | 3 +++ .../qtci-osx-10.8-x86_64/002-disable-screensaver.sh | 3 +++ .../qtci-osx-10.9-x86_64/002-disable-screensaver.sh | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh create mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh create mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 From 0ce4f02c5f40eb8a3323db69683d04f9bb3df88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 5 Dec 2016 14:03:56 +0100 Subject: [PATCH 4/9] Suppress shutdown indicator in Ubuntu We want to quit machines without being asked, if we are really sure. Change-Id: Ic7156f5b0fe236c0270d8c2e4fcc322a82776caf Reviewed-by: Simon Hausmann Reviewed-by: Frederik Gladhorn --- .../001-suppress-shutdown-indicator.sh | 4 ++++ .../001-suppress-shutdown-indicator.sh | 4 ++++ .../001-suppress-shutdown-indicator.sh | 4 ++++ .../{001-apt-update.sh => 003-apt-update.sh} | 0 4 files changed, 12 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{001-apt-update.sh => 003-apt-update.sh} (100%) diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh new file mode 100644 index 00000000..f11263b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +# Disable questions on shutdown. +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh new file mode 100644 index 00000000..f11263b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +# Disable questions on shutdown. +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh new file mode 100644 index 00000000..f11263b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +# Disable questions on shutdown. +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh From 16d05b088e054ed4442d8acd3884dde741ead56d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 8 Dec 2016 08:18:50 +0100 Subject: [PATCH 5/9] Improve disabling of screensaver on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Setting the idleTime on currentHost works well, until the hardware UUID changes and thus the host ID for the setting. With kvm that happens quite frequently, with vmware less but also occasionally (deep clone for example). By disabling the screensaver on start-up we can cover all cases quite easily. Change-Id: Ibdcf404430656f9caa47386ca3c732366ddfc8c7 Reviewed-by: Jędrzej Nowacki --- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- 4 files changed, 96 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT From e86ba9e1f70be1e28c681a3cf7f685a4d93612cf Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 16 Dec 2016 14:17:04 +0200 Subject: [PATCH 6/9] Provision: Android openssl 1.0.2j for Windows 7 We are currently using too old openssl for Android builds in Windows 7. Openssl version need to be at least 1.0.1. This script will configure openssl 1.0.2j for Android using tools from msys. Change-Id: I9ab9a3b4f9f3953cf99bf15fee631f5a7961b42d Reviewed-by: Simon Hausmann --- .../qtci-windows-7-x86/04-msys.ps1 | 14 ++++++++ .../qtci-windows-7-x86/android_openssl.ps1 | 32 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 coin/provisioning/qtci-windows-7-x86/04-msys.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 new file mode 100644 index 00000000..b75fd2a6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 @@ -0,0 +1,14 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install msys which is needed for configuring openssl for Android + +$version = "1.0.11" +$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z" + +$zip = "c:\users\qt\downloads\msys-$version.7z" +$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" +$destination = "C:\msys" + +Download $url $url $zip +Verify-Checksum $zip $sha1 +C:\Utils\sevenzip\7z.exe x $zip -oC:\ diff --git a/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 new file mode 100644 index 00000000..a1b656c6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 @@ -0,0 +1,32 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# OpenSSL need to be configured from sources for Android build in windows 7 +# Msys need to be installed to target machine +# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html + +$version = "1.0.2j" +$zip = "c:\users\qt\downloads\openssl-$version.tar.gz" +$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" +$destination = "C:\Utils\openssl-android-master" + +Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip +Verify-Checksum $zip $sha1 + +C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils +C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils +Remove-Item $destination -Force -Recurse +Rename-Item C:\Utils\openssl-$version $destination +Remove-Item $zip +Remove-Item C:\Utils\openssl-$version.tar + +set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc +set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar +set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr +$env:Path = $env:Path + ";C:\msys\1.0\bin" + +echo "Configuring OpenSSL $version for Android..." +cd $destination +C:\msys\1.0\bin\bash.exe -c "perl Configure shared android" + +# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. +# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h From fc6717cf23f0d0cff04000ac5a69a736d68b9c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 13 Dec 2016 08:51:24 +0200 Subject: [PATCH 7/9] Provision: Install pyside python dependencies to Linux To test successfully pyside dependencies with Coin, we need python-dev packages and virtual env. Change-Id: I29a5eed769798da4e4799eb5ccdff1cd032070d5 Reviewed-by: Simon Hausmann --- .../provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 4 ++++ .../provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 5 +++++ .../qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh new file mode 100644 index 00000000..b419f217 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -0,0 +1,4 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo yum install -y python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh new file mode 100644 index 00000000..ad1bf18f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh @@ -0,0 +1,5 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo subscription-manager refresh +sudo yum install -y python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh new file mode 100644 index 00000000..205f598b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh @@ -0,0 +1,6 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside + +sudo apt-get update +sudo apt-get install -y python-dev From ff1ad70a197069ea455cc8c2daaa870e8ec528e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 13 Dec 2016 09:00:12 +0200 Subject: [PATCH 8/9] Provision: Install pyside python dependencies to Windows To test successfully pyside dependencies with Coin, we need python virtual env. Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84 Reviewed-by: Simon Hausmann --- coin/provisioning/common/python.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 39d8146d..32972830 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -62,3 +62,7 @@ echo "Chancing allowZip64 value to 'True'..." echo "Remove $package..." del $package Add-Path $path + +& python -m ensurepip +# Install python virtual env +pip.exe install virtualenv From 8a60455e61d6a7cd11eb7da02bdf1cae8ff97b8b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 15 Dec 2016 10:31:03 +0100 Subject: [PATCH 9/9] Remove shutdown "helpers" for macOS It turns out that they don't quite work the way we expected them to, and instead we Coin is going to shut down the VMs directly at the right time. Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263 Reviewed-by: Simon Hausmann --- .../provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh | 8 -------- .../provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh | 8 -------- coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh | 10 ---------- coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh | 8 -------- 4 files changed, 34 deletions(-) delete mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh delete mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh delete mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh delete mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh deleted file mode 100644 index 1f17b545..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Make sure to shut down the machine cleanly when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh deleted file mode 100644 index 1f17b545..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Make sure to shut down the machine cleanly when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh deleted file mode 100644 index 73e5efa7..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# OS X 10.8 and VMWare tools don't play well together. -# The shutdown command fails, so just shut down the machine -# manually when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh deleted file mode 100644 index 1f17b545..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Make sure to shut down the machine cleanly when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1