aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-01-14 13:25:30 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2021-01-21 10:29:03 +0200
commit2874c51d2d236e2f5173c3466df53d827ca8dabd (patch)
tree9a6f23a6d00569130eeddb8b62b1dd83299e7a16
parentef14fba1654b0207a6390093bb1e485357d52f5f (diff)
Provisioning: Add --ignore-signature to ICC installation
ICC installation fails when checking digital signature Task-number: QTQAINFRA-4174 Change-Id: Idcbca27a852abbd0824938f825807121a4f60c3e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit d238c03742fb7568ad794017875f63f6a854b5ff)
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/18-icc.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/18-icc.sh
index 7ab8528a..0bfae515 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/18-icc.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/18-icc.sh
@@ -76,7 +76,7 @@ ARCH_SELECTED=ALL
COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset
EOT
-(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu)
+(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature)
# Export LD_LIBRARY_PATH to Coin
echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh
index 2bf47639..833287e0 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh
@@ -78,7 +78,7 @@ ARCH_SELECTED=INTEL64
COMPONENTS=;intel-conda-index-tool__x86_64;intel-comp__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps__x86_64;intel-comp-ps-ss-bec__x86_64;intel-openmp__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-conda-icc_rt-linux-64-shadow-package__x86_64;intel-icc__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-doc__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icx__x86_64;intel-icx-common__noarch;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-conda-tbb-linux-64-shadow-package__x86_64;intel-conda-tbb-devel-linux-64-shadow-package__x86_64;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-compxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset
EOT
-( cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu )
+(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu)
# Export LD_LIBRARY_PATH to Coin
echo "export ICC64_19_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc