aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64
diff options
context:
space:
mode:
authorJuha Karjalainen <juha.karjalainen@qt.io>2018-11-01 12:23:34 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2019-06-10 10:07:20 +0000
commit31f5c48a80e140562588bd673ef35fb4efe3d643 (patch)
tree7d439a99c4890bfc7abaef89430c67f3a2db0341 /coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64
parent5fd662b550d2fc8f32101ef3a4981e71c01b2f0a (diff)
Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 3e838f2a34d0c1538535bd184aa12681497c8a38)
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64')
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh)0
2 files changed, 6 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh
new file mode 100755
index 00000000..4f1d3768
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh
index 81ea3b17..81ea3b17 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh