aboutsummaryrefslogtreecommitdiffstats
path: root/coin_test_instructions.py
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2019-11-18 09:26:27 +0200
committerSimo Fält <simo.falt@qt.io>2019-11-20 12:19:47 +0200
commit2cfb016e28e0403f06b42f90c21dcfabe6b19db9 (patch)
treee97b2623472986769ebbc0563fcb517c6d45cc40 /coin_test_instructions.py
parent6564925be8c6875f300d0013726a52337f23ca17 (diff)
Brute solution for skipping missing ci template
There is a problem with Ubuntu 18.04 provisioning in Qt5#5.12.6 branch, so we can't use that target. In order to be able to skip that, we have to use CI's custom module class instead of pyside class to get pass the blocker. This commit is only to be used in release branch, while it disables LicenceCheck target. Change-Id: I5530d4ae19584685bbec034d0b8b977f25082ba2 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'coin_test_instructions.py')
-rw-r--r--coin_test_instructions.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index aeedd03e7..92ecf2841 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -43,7 +43,6 @@ from build_scripts.utils import install_pip_wheel_package
from build_scripts.utils import get_qtci_virtualEnv
from build_scripts.utils import run_instruction
from build_scripts.utils import rmtree
-from build_scripts.utils import acceptCITestConfiguration
from build_scripts.utils import get_ci_qmake_path
import os
@@ -84,8 +83,6 @@ def call_testrunner(python_ver, buildnro):
run_instruction(cmd, "Error while running wheel_tester.py")
def run_test_instructions():
- if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER):
- exit()
# Remove some environment variables that impact cmake
for env_var in ['CC', 'CXX']:
@@ -99,7 +96,7 @@ def run_test_instructions():
call_testrunner("", str(testRun))
testRun =+ 1
# We know that second build was with python3
- if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]:
+ if CI_RELEASE_CONF:
call_testrunner("3", str(testRun))
if __name__ == "__main__":