From 6d1190aaa0d6c258f159e50d4aa3073b3e7f105f Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 24 Jan 2018 10:48:07 +0200 Subject: Provisioning: Use SetEnvVar helper function in scripts Currently when adding an environment variable in provisioning we have to check if the system is Ubuntu and use .profile instead of .bashrc. This check should be done in a function so we don't have to duplicate it for every provisioning script separately. Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55 Reviewed-by: Maurice Kalinowski Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | 5 ++++- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh index 74ef2b4e..9ff1ec6c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh @@ -33,6 +33,9 @@ ############################################################################# set -ex + +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + # build latest qemu to usermode sudo apt-get -y install automake autoconf libtool @@ -91,4 +94,4 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i # Set QEMU font configuration variables -echo "export QEMU_SET_ENV=\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" >> ~/.profile +SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh index ddb1d3dc..c792d8b5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh @@ -38,6 +38,7 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt..." @@ -76,10 +77,10 @@ chmod +x "$yoctoInstaller" rm -rf "$yoctoInstaller" if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then - echo "export QEMUARMV7_TOOLCHAIN_SYSROOT=$yoctoLocationARMv7/$sysrootARMv7" >> ~/.profile - echo "export QEMUARMV7_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARMv7/$crosscompileARMv7" >> ~/.profile - echo "export QEMUARM64_TOOLCHAIN_SYSROOT=$yoctoLocationARM64/$sysrootARM64" >> ~/.profile - echo "export QEMUARM64_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARM64/$crosscompileARM64" >> ~/.profile + SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" + SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" + SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" + SetEnvVar "QEMUARM64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARM64/$crosscompileARM64" else echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2 exit 1 -- cgit v1.2.3 From c4cf4fa07fc435595bfeb5004568d0709cf43bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 18 Jan 2018 12:09:00 +0200 Subject: Add nfs-common for mounting to work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1690 Change-Id: I43453da3267664c664e80510e3750d1906d00078 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index b81162d5..d15e0059 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -56,6 +56,8 @@ try installPackages+=(git) # 7zip is a needed decompressing tool installPackages+=(p7zip-full) + # To be able to mount yocto-cache during builds + installPackages+=(nfs-common) # libssl-dev provides headers for OpenSSL installPackages+=(libssl-dev) # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git -- cgit v1.2.3 From 462a2aae2b8ba298d893ba52d16c1b13435f04ff Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 24 Apr 2017 12:31:38 +0300 Subject: Provisioning: Add Squish provisioning for Release Test Automation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squish is required by RTA for testing. Task-number: QTQAINFRA-1523 Change-Id: I0c3653565f19cc9b798a0b63325c47b017cf5537 Reviewed-by: Joni Jäntti Reviewed-by: Matti Paaso --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh new file mode 100755 index 00000000..27ff15c3 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/unix/squishInstall.sh + -- cgit v1.2.3