diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-02 10:46:49 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-02 10:46:49 +0100 |
| commit | 38e2fc6b808186b41183b6e4601c086dc81d35bf (patch) | |
| tree | c1b2faecf005d02b94a1f8c2cd423aff3a06c78d /coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64 | |
| parent | da65a37041aa35a719130050cebad3ea0356e059 (diff) | |
| parent | b6283a31c8db19d6d1939957a503e25b98394507 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.gitmodules
coin/provisioning/common/linux/docker_testserver.sh
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Done-With: Ryan Chu <ryan.chu@qt.io>
Change-Id: I9bc3afcb50783a9f0f7718731d237de4be287cae
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh) | 0 |
4 files changed, 10 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 2c46e703..0e626936 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -157,6 +157,8 @@ installPackages+=(virtualbox) installPackages+=(dkms) # Needed for qtspeech installPackages+=(libspeechd-dev) +#Pypdf for PDF reading in RTA tests +installPackages+=(python-pypdf2) # Needed for b2qt installPackages+=(git-lfs) installPackages+=(chrpath) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh new file mode 100755 index 00000000..f38c9bab --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-notifications.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-notifications.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh new file mode 100755 index 00000000..09477763 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/remove-apport.sh +source "${BASH_SOURCE%/*}/../common/linux/remove-apport.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh index e4d988fc..e4d988fc 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh |