aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2022-08-18 11:04:06 +0300
committerSimo Fält <simo.falt@qt.io>2022-08-18 11:50:13 +0300
commit19c194d28e9bebb4b0ec66ba42eea9d5dddcc49a (patch)
tree787f133aed66c0155d59251e8c05a5c5da235d1c
parentdb143665ff9df2e07cc4d072e88cfe071666c63f (diff)
CI: Use same python with testrun as with build on win
It seems the default python3.6 is broken on tier2 vm template. Pick-to: 6.2 6.3 Change-Id: I8f45e3a9561eca4adefaa575d784071011168c1b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-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 e90c9e8af..461805043 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -96,9 +96,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: