CI: Update used python version to 3.10 on windows

Change-Id: I125390b20df9a34e16f86842892c31aae8773b84
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

4 files changed, 17 insertions, 18 deletions

diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index d914848d9..a422899e0 100644
--- a/coin/instructions/common_environment.yaml
+++ b/coin/instructions/common_environment.yaml
@@ -35,6 +35,18 @@ instructions:
             property: host.os
             equals_value: Windows
     - type: EnvironmentVariable
+      variableName: PYTHON3_PATH
+      variableValue: "{{ index .Env \"PYTHON3.10.0-64_PATH\"}}"
+      enable_if:
+        condition: and
+        conditions:
+          - condition: property
+            property: host.osVersion
+            equals_value: Windows_11_22H2
+          - condition: property
+            property: host.os
+            equals_value: Windows
+    - type: EnvironmentVariable
       variableName: TARGET_ARCHITECTURE
       variableValue: amd64_x86
       enable_if:
@@ -118,7 +130,7 @@ instructions:
          equals_value: MacOS
     - type: PrependToEnvironmentVariable
       variableName: PATH
-      variableValue: "{{.Env.PYTHON3_PATH}};"
+      variableValue: "{{ index .Env \"PYTHON3.10.0-64_PATH\"}};"
       enable_if:
          condition: property
          property: host.os
diff --git a/coin/instructions/execute_build_instructions.yaml b/coin/instructions/execute_build_instructions.yaml
index 2cdc61fcf..317adae2a 100644
--- a/coin/instructions/execute_build_instructions.yaml
+++ b/coin/instructions/execute_build_instructions.yaml
@@ -42,18 +42,11 @@ instructions:
          Failed to execute build instructions on macOS
   - type: EnvironmentVariable
     variableName: PYSIDE_SIGNING_DIR
-    variableValue: "{{.AgentWorkingDir}}\\pyside\\{{.Env.TESTED_MODULE_COIN}}\\build\\qfpa-p3.8\\package_for_wheels"
-    enable_if:
-        condition: property
-        property: host.osVersion
-        contains_value: "Windows_11"
-  - type: EnvironmentVariable
-    variableName: PYSIDE_SIGNING_DIR
     variableValue: "{{.AgentWorkingDir}}\\pyside\\{{.Env.TESTED_MODULE_COIN}}\\build\\qfpa-p3.10\\package_for_wheels"
     enable_if:
         condition: property
-        property: host.osVersion
-        contains_value: "Windows_10"
+        property: host.os
+        equals_value: Windows
   - type: ExecuteCommand
     command: "{{.Env.interpreter}} -m pip install -U pip setuptools==69.1.1 --user"
     maxTimeInSeconds: 14400
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index 0f278dbcf..83d46977e 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -157,10 +157,7 @@ if __name__ == "__main__":
         python_ver = "3.11"
     wheel_package_dir = "qfpa-p3.6"
     if CI_TARGET_OS in ["Windows"]:
-        if (os.environ.get("HOST_OSVERSION_COIN")).startswith("windows_10"):
-            python_ver = "3.10.0"
-        else:
-            python_ver = "3.8.1"
+        python_ver = "3.10.0"
     if CI_TEST_PHASE in ["ALL", "BUILD"]:
         call_setup(python_ver, "BUILD")
     # Until CI has a feature to set more dynamic signing dir, make sure it actually exist
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index 219fcf377..b0e71fba7 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -96,10 +96,7 @@ def run_test_instructions():
 
     # In win machines, there are additional python versions to test with
     if CI_HOST_OS == "Windows":
-        if (os.environ.get('HOST_OSVERSION_COIN')).startswith('windows_10'):
-            call_testrunner("3.10.0", str(testRun))
-        else:
-            call_testrunner("3.8.1", str(testRun))
+        call_testrunner("3.10.0", str(testRun))
     elif CI_HOST_OS == "Linux":
         call_testrunner("3.11", str(testRun))
     else: