Coin: Update instruction yamls to run qtsdk scripts in Pipenv

Install the Python module dependencies for qtsdk from Pipfile and run
the install_qt.py and bld_sdktool.py script inside the Pipenv virtual
environment.

Change-Id: Id84733b822964ed2099883de3708f9da2e2d1818
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

2 files changed, 40 insertions, 22 deletions

diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml
index c22e384f6c..23461dbcf4 100644
--- a/coin/instructions/build.yaml
+++ b/coin/instructions/build.yaml
@@ -30,8 +30,10 @@ instructions:
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run build.py, check logs."
+      - type: ChangeDirectory
+        directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools"
       - type: ExecuteCommand
-        command: "python3 -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make"
+        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to build sdktool, check logs."
@@ -62,8 +64,10 @@ instructions:
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run build.py, check logs."
+      - type: ChangeDirectory
+        directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools"
       - type: ExecuteCommand
-        command: "python3 -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make"
+        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to build sdktool, check logs."
@@ -109,8 +113,10 @@ instructions:
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run build.py, check logs."
+      - type: ChangeDirectory
+        directory: "{{.AgentWorkingDir}}\\build\\qtsdk\\packaging-tools"
       - type: ExecuteCommand
-        command: "python -u {{.AgentWorkingDir}}\\build\\qtsdk\\packaging-tools\\bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}\\build\\sdktool\\qt --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\src\\tools\\sdktool --build {{.AgentWorkingDir}}\\build\\sdktool\\build --install {{.AgentWorkingDir}}\\build\\sdktool\\install --make-command nmake"
+        command: "python -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}\\build\\sdktool\\qt --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\src\\tools\\sdktool --build {{.AgentWorkingDir}}\\build\\sdktool\\build --install {{.AgentWorkingDir}}\\build\\sdktool\\install --make-command nmake"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to build sdktool, check logs."
diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml
index 724bf30b38..bbed89c388 100644
--- a/coin/instructions/provision.yaml
+++ b/coin/instructions/provision.yaml
@@ -14,10 +14,6 @@ instructions:
         directory: "{{.AgentWorkingDir}}/build"
       - type: MakeDirectory
         directory: "{{.BuildDir}}"
-    enable_if:
-      condition: property
-      property: features
-      contains_value: OutOfSourceBuild
   - type: ChangeDirectory
     directory: "{{.BuildDir}}"
   - type: InstallSourceArchive
@@ -27,21 +23,46 @@ instructions:
     ref: master
     directory: "build/qtsdk"
     userMessageOnFailure: "Failed to install qtsdk, check logs"
+  - type: ExecuteCommand
+    command: "python3 -m pip install pipenv==2022.4.8 --user"
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 120
+    userMessageOnFailure: "Failed to install Pipenv"
     enable_if:
       condition: property
       property: host.os
-      in_values: [MacOS, Linux, Windows]
+      in_values: [MacOS, Linux]
+  - type: ExecuteCommand
+    command: "python -m pip install pipenv==2022.4.8 --user"
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 120
+    userMessageOnFailure: "Failed to install Pipenv"
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+  - type: ChangeDirectory
+    directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools"
   - type: ExecuteCommand
-    command: "pip3 install wget colorlog"
+    command: "python3 -m pipenv install --skip-lock"
     maxTimeInSeconds: 1200
     maxTimeBetweenOutput: 120
-    userMessageOnFailure: "Failed to install Python packages, check logs."
+    userMessageOnFailure: "Failed to install requirements from Pipfile"
     enable_if:
       condition: property
       property: host.os
       in_values: [MacOS, Linux]
   - type: ExecuteCommand
-    command: "python3 -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z http://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
+    command: "python -m pipenv install --skip-lock"
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 120
+    userMessageOnFailure: "Failed to install requirements from Pipfile"
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+  - type: ExecuteCommand
+    command: "python3 -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z http://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 3600
     maxTimeBetweenOutput: 360
@@ -51,7 +72,7 @@ instructions:
       property: host.os
       equals_value: Linux
   - type: ExecuteCommand
-    command: "python3 -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} {{.Env.QTC_QT_MODULES}}"
+    command: "python3 -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} {{.Env.QTC_QT_MODULES}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 3600
     maxTimeBetweenOutput: 360
@@ -61,16 +82,7 @@ instructions:
       property: host.os
       equals_value: MacOS
   - type: ExecuteCommand
-    command: "pip.exe install pywin32 wget colorlog"
-    maxTimeInSeconds: 1200
-    maxTimeBetweenOutput: 120
-    userMessageOnFailure: "Failed to install Python packages, check logs."
-    enable_if:
-      condition: property
-      property: host.os
-      equals_value: Windows
-  - type: ExecuteCommand
-    command: "python -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --opengl32sw7z http://master.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z http://master.qt.io/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z http://ci-files02-hki.intra.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}"
+    command: "python -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --opengl32sw7z http://master.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z http://master.qt.io/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z http://ci-files02-hki.intra.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 3600
     maxTimeBetweenOutput: 360