aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2022-08-18 11:04:06 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-18 13:03:09 +0000
commit72c882a1ed0f62d150939982b0390bd6ffe63b94 (patch)
treee1fde901c8782888d0a8e9cbdbdda01adff2cc6b
parentee6e659a483d11b4e77dbb1c66d7dc314e0864b1 (diff)
CI: Use same python with testrun as with build on win
It seems the default python3.6 is broken on tier2 vm template. Change-Id: I8f45e3a9561eca4adefaa575d784071011168c1b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 19c194d28e9bebb4b0ec66ba42eea9d5dddcc49a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin_test_instructions.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index 8c8838b71..52c61d9eb 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -132,9 +132,10 @@ def run_test_instructions():
# In win machines, there are additional python versions to test with
if CI_HOST_OS == "Windows":
- call_testrunner("3.6.1", str(testRun))
- call_testrunner("3.8.1", str(testRun))
- call_testrunner("3.10.0", str(testRun))
+ if os.environ.get('HOST_OSVERSION_COIN') == 'windows_10_21h2':
+ call_testrunner("3.10.0", str(testRun))
+ else:
+ call_testrunner("3.7.9", str(testRun))
elif CI_HOST_OS == "Linux":
call_testrunner("3.8", str(testRun))
else: