Split module config instructions

Change-Id: Ia0b47d0e264f00d859e20e18980b7899dddaba98
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

7 files changed, 516 insertions, 489 deletions

diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
new file mode 100644
index 000000000..2c6603334
--- /dev/null
+++ b/coin/instructions/common_environment.yaml
@@ -0,0 +1,117 @@
+type: Group
+instructions:
+    - type: EnvironmentVariable
+      variableName: TARGET_ARCHITECTURE
+      variableValue: amd64
+      enable_if:
+        condition: and
+        conditions:
+          - condition: property
+            property: target.arch
+            equals_value: X86_64
+          - condition: property
+            property: host.os
+            equals_value: Windows
+    - type: EnvironmentVariable
+      variableName: TARGET_ARCHITECTURE
+      variableValue: amd64_x86
+      enable_if:
+        condition: and
+        conditions:
+          - condition: property
+            property: target.arch
+            equals_value: X86
+          - condition: property
+            property: host.os
+            equals_value: Windows
+    - type: EnvironmentVariable
+      variableName: CI_TARGET_ARCHITECTURE
+      variableValue: X86_64
+      enable_if:
+          condition: property
+          property: target.arch
+          equals_value: X86_64
+    - type: EnvironmentVariable
+      variableName: CI_TARGET_ARCHITECTURE
+      variableValue: X86
+      enable_if:
+          condition: property
+          property: target.arch
+          equals_value: X86
+    - type: EnvironmentVariable
+      variableName: CI_PACKAGING_FEATURE
+      variableValue: "--packaging"
+      enable_if:
+          condition: property
+          property: features
+          contains_value: Packaging
+    - type: EnvironmentVariable
+      variableName: CI_OS
+      variableValue: "MacOS"
+      enable_if:
+          condition: property
+          property: host.os
+          equals_value: MacOS
+    - type: EnvironmentVariable
+      variableName: CI_OS
+      variableValue: "Linux"
+      enable_if:
+          condition: property
+          property: host.os
+          equals_value: Linux
+    - type: EnvironmentVariable
+      variableName: CI_OS
+      variableValue: "Windows"
+      enable_if:
+          condition: property
+          property: host.os
+          equals_value: Windows
+    - type: EnvironmentVariable
+      variableName: MAKEFLAGS
+      variableValue: ""
+      enable_if:
+         condition: property
+         property: host.os
+         equals_value: Windows
+    - type: AppendToEnvironmentVariable
+      variableName: PATH
+      variableValue: ;%CI_JOM_PATH%
+      enable_if:
+         condition: property
+         property: host.os
+         equals_value: Windows
+    - type: PrependToEnvironmentVariable
+      variableName: PATH
+      variableValue: "\\Users\\qt\\work\\install\\bin;"
+      enable_if:
+         condition: property
+         property: host.os
+         equals_value: Windows
+    - type: EnvironmentVariable
+      variableName: ICC64_18_LDLP
+      variableValue: /opt/intel/lib/intel64
+      enable_if:
+         condition: property
+         property: target.compiler
+         equals_value: ICC_18
+    - type: EnvironmentVariable
+      variableName: ICC64_18_PATH # Seems a bit hard to maintain
+      variableValue: /opt/intel/compilers_and_libraries_2018.1.163/linux/bin/intel64:/opt/intel/bin
+      enable_if:
+         condition: property
+         property: target.compiler
+         equals_value: ICC_18
+    - type: AppendToEnvironmentVariable
+      variableName: LD_LIBRARY_PATH
+      variableValue: :/opt/intel/lib/intel64
+      enable_if:
+         condition: property
+         property: target.compiler
+         equals_value: ICC_18
+    - type: AppendToEnvironmentVariable
+      variableName: PATH
+      variableValue: ":{{.Env.ICC64_18_PATH}}"
+      enable_if:
+         condition: property
+         property: target.compiler
+         equals_value: ICC_18
diff --git a/coin/instructions/execute_build_instructions.yaml b/coin/instructions/execute_build_instructions.yaml
new file mode 100644
index 000000000..fd65840b9
--- /dev/null
+++ b/coin/instructions/execute_build_instructions.yaml
@@ -0,0 +1,134 @@
+type: Group
+instructions:
+  - type: ExecuteCommand
+    command: python -u coin_build_instructions.py --os=MacOS --packaging --instdir=/Users/qt/work/install  --targetOs=MacOS --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 300
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: MacOS
+        - condition: property
+          property: features
+          contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute build instructions on osx
+  - type: ExecuteCommand
+    command: python -u coin_build_instructions.py --os=MacOS --instdir=/Users/qt/work/install  --targetOs=MacOS --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 300
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: MacOS
+        - condition: property
+          property: features
+          not_contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute build instructions on osx
+  - type: ExecuteCommand
+    command: python -u coin_build_instructions.py --os=Linux --packaging --instdir=/home/qt/work/install  --targetOs=Linux --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 300
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Linux
+        - condition: property
+          property: features
+          contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute build instructions on Linux
+  - type: ExecuteCommand
+    command: python -u coin_build_instructions.py --os=Linux --instdir=/home/qt/work/install  --targetOs=Linux --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 300
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Linux
+        - condition: property
+          property: features
+          not_contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute build instructions on Linux
+  - type: ExecuteCommand
+    command: c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os=Windows --packaging --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 300
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: features
+          contains_value: Packaging
+        - condition: property
+          property: target.arch
+          equals_property: host.arch
+    userMessageOnFailure: >
+         Failed to execute build instructions on 64 bit Windows
+  - type: ExecuteCommand
+    command: c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 300
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: features
+          not_contains_value: Packaging
+        - condition: property
+          property: target.arch
+          equals_property: host.arch
+    userMessageOnFailure: >
+         Failed to execute build instructions on 64 bit Windows
+  - type: ExecuteCommand
+    command: c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os=Windows --packaging --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 300
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: features
+          contains_value: Packaging
+        - condition: property
+          property: target.arch
+          equals_value: X86
+    userMessageOnFailure: >
+         Failed to execute 32 bit build instructions on 64 bit Windows
+  - type: ExecuteCommand
+    command: c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 300
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: features
+          not_contains_value: Packaging
+        - condition: property
+          property: target.arch
+          equals_value: X86
+    userMessageOnFailure: >
+         Failed to execute 32 bit build instructions on 64 bit Windows
diff --git a/coin/instructions/execute_license_check.yaml b/coin/instructions/execute_license_check.yaml
new file mode 100644
index 000000000..3a78a0aab
--- /dev/null
+++ b/coin/instructions/execute_license_check.yaml
@@ -0,0 +1,31 @@
+type: Group
+instructions:
+    - type: ChangeDirectory
+      directory: "{{.AgentWorkingDir}}"
+    - type: InstallSourceArchive
+      maxTimeInSeconds: 600
+      maxTimeBetweenOutput: 600
+      project: qt/qtbase
+      ref: 5.14
+      directory: qt/qtbase
+      userMessageOnFailure: >
+              Could not install source archive. Please investigate why.
+    - type: InstallSourceArchive
+      maxTimeInSeconds: 600
+      maxTimeBetweenOutput: 600
+      project: qt/qtqa
+      ref: master
+      directory: qt/qtqa-latest
+      userMessageOnFailure: >
+              Could not install source archive. Please investigate why.
+    - type: EnvironmentVariable
+      variableName: QT_MODULE_TO_TEST
+      variableValue: pyside/pyside-setup
+      userMessageOnFailure: >
+              Failed to set environment variable. This should not happen.
+    - type: ExecuteCommand
+      command: perl qt/qtqa-latest/tests/prebuild/license/tst_licenses.pl
+      maxTimeInSeconds: 7200
+      maxTimeBetweenOutput: 120
+      userMessageOnFailure: >
+           Failed to run license check script.
diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml
new file mode 100644
index 000000000..f4446e85c
--- /dev/null
+++ b/coin/instructions/execute_test_instructions.yaml
@@ -0,0 +1,141 @@
+type: Group
+enable_if:
+  condition: property
+  property: features
+  not_contains_value: LicenseCheck
+instructions:
+  - type: EnvironmentVariable
+    variableName: QTEST_ENVIRONMENT
+    variableValue: "ci"
+  - type: ExecuteCommand
+    command: python -u coin_test_instructions.py --os=MacOS --instdir=/Users/qt/work/install  --targetOs=MacOS --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 7200
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: MacOS
+        - condition: property
+          property: features
+          not_contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute test instructions on osx
+  - type: ExecuteCommand
+    command: python -u coin_test_instructions.py --packaging --os=MacOS --instdir=/Users/qt/work/install  --targetOs=MacOS --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 7200
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: MacOS
+        - condition: property
+          property: features
+          contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute test instructions on osx
+  - type: ExecuteCommand
+    command: python -u coin_test_instructions.py --os=Linux --instdir=/home/qt/work/install  --targetOs=Linux --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Linux
+        - condition: property
+          property: features
+          not_contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute test instructions on Linux
+  - type: ExecuteCommand
+    command: python -u coin_test_instructions.py --packaging --os=Linux --instdir=/home/qt/work/install  --targetOs=Linux --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Linux
+        - condition: property
+          property: features
+          contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute test instructions on Linux
+  - type: ExecuteCommand
+    command: c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 7200
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.arch
+          equals_property: host.arch
+        - condition: property
+          property: features
+          not_contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute test instructions on 64 bit Windows
+  - type: ExecuteCommand
+    command: c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86
+    maxTimeInSeconds: 7200
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.arch
+          equals_value: X86
+        - condition: property
+          property: features
+          not_contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute test instructions on 64 bit Windows
+  - type: ExecuteCommand
+    command: c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --packaging --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86_64
+    maxTimeInSeconds: 7200
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.arch
+          equals_property: host.arch
+        - condition: property
+          property: features
+          contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute 32 bit test instructions on 64 bit Windows
+  - type: ExecuteCommand
+    command: c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --packaging --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86
+    maxTimeInSeconds: 7200
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.arch
+          equals_value: X86
+        - condition: property
+          property: features
+          contains_value: Packaging
+    userMessageOnFailure: >
+         Failed to execute 32 bit test instructions on 64 bit Windows
diff --git a/coin/instructions/find_path_to_msvc_compiler.yaml b/coin/instructions/find_path_to_msvc_compiler.yaml
new file mode 100644
index 000000000..8f9bed82f
--- /dev/null
+++ b/coin/instructions/find_path_to_msvc_compiler.yaml
@@ -0,0 +1,28 @@
+type: Group
+enable_if:
+  condition: property
+  property: host.os
+  equals_value: Windows
+instructions:
+  - type: EnvironmentVariable
+    variableName: VC_SCRIPT
+    variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+    enable_if:
+      condition: property
+      property: host.compiler
+      equals_value: MSVC2017
+  - type: EnvironmentVariable
+    variableName: VC_SCRIPT
+    variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio\\2019\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+    enable_if:
+      condition: property
+      property: host.compiler
+      equals_value: MSVC2019
+  - type: WriteFile
+    fileContents: "call \"{{.Env.VC_SCRIPT}}\" {{.Env.TARGET_ARCHITECTURE}} \r\ncmd /c %*"
+    filename: "c:\\users\\qt\\MSVC.bat"
+    fileMode: 420
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
diff --git a/coin/instructions/relocate_pyside.yaml b/coin/instructions/relocate_pyside.yaml
new file mode 100644
index 000000000..afab83c70
--- /dev/null
+++ b/coin/instructions/relocate_pyside.yaml
@@ -0,0 +1,57 @@
+type: Group
+enable_if:
+  condition: property
+  property: features
+  not_contains_value: LicenseCheck
+instructions:
+  - type: ChangeDirectory
+    directory: "{{.AgentWorkingDir}}/pyside"
+    maxTimeInSeconds: 300
+    maxTimeBetweenOutput: 120
+    userMessageOnFailure: >
+         Failed to change to pyside dir
+  - type: ExecuteCommand
+    command: c:\\users\\qt\\MSVC.bat rd /s /q pyside-setup
+    maxTimeInSeconds: 300
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+    userMessageOnFailure: >
+         Failed to remove pyside-setup dir
+  - type: ExecuteCommand
+    command: /bin/rm -rf pyside-setup
+    maxTimeInSeconds: 300
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: property
+      property: host.os
+      not_equals_value: Windows
+    userMessageOnFailure: >
+         Failed to remove pyside-setup dir
+  - type: InstallBinaryArchive
+    relativeStoragePath: "{{.Env.MODULE_ARTIFACTS_RELATIVE_STORAGE_PATH}}/artifacts.tar.gz"
+    directory: "pyside"
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
+  - type: ChangeDirectory
+    directory: "{{.AgentWorkingDir}}\\pyside\\pyside-setup"
+    maxTimeInSeconds: 7200
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+    userMessageOnFailure: >
+         Failed to install binary artifacts
+  - type: ChangeDirectory
+    directory: "{{.AgentWorkingDir}}/pyside/pyside-setup"
+    maxTimeInSeconds: 7200
+    maxTimeBetweenOutput: 120
+    enable_if:
+      condition: property
+      property: host.os
+      not_equals_value: Windows
+    userMessageOnFailure: >
+         Failed to change to pyside-setup dir
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 90df3cfed..772166fb5 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -31,457 +31,6 @@ accept_configuration:
             property: features
             contains_value: LicenseCheck
 
-set_environment: &set_environment
-  type: Group
-  instructions:
-    - type: EnvironmentVariable
-      variableName: TARGET_ARCHITECTURE
-      variableValue: amd64
-      enable_if:
-        condition: and
-        conditions:
-          - condition: property
-            property: target.arch
-            equals_value: X86_64
-          - condition: property
-            property: host.os
-            equals_value: Windows
-    - type: EnvironmentVariable
-      variableName: TARGET_ARCHITECTURE
-      variableValue: amd64_x86
-      enable_if:
-        condition: and
-        conditions:
-          - condition: property
-            property: target.arch
-            equals_value: X86
-          - condition: property
-            property: host.os
-            equals_value: Windows
-    - type: EnvironmentVariable
-      variableName: MAKEFLAGS
-      variableValue: ""
-      enable_if:
-         condition: property
-         property: host.os
-         equals_value: Windows
-    - type: AppendToEnvironmentVariable
-      variableName: PATH
-      variableValue: ;%CI_JOM_PATH%
-      enable_if:
-         condition: property
-         property: host.os
-         equals_value: Windows
-    - type: PrependToEnvironmentVariable
-      variableName: PATH
-      variableValue: "\\Users\\qt\\work\\install\\bin;"
-      enable_if:
-         condition: property
-         property: host.os
-         equals_value: Windows
-    - type: EnvironmentVariable
-      variableName: ICC64_18_LDLP
-      variableValue: /opt/intel/lib/intel64
-      enable_if:
-         condition: property
-         property: target.compiler
-         equals_value: ICC_18
-    - type: EnvironmentVariable
-      variableName: ICC64_18_PATH # Seems a bit hard to maintain
-      variableValue: /opt/intel/compilers_and_libraries_2018.1.163/linux/bin/intel64:/opt/intel/bin
-      enable_if:
-         condition: property
-         property: target.compiler
-         equals_value: ICC_18
-    - type: AppendToEnvironmentVariable
-      variableName: LD_LIBRARY_PATH
-      variableValue: :/opt/intel/lib/intel64
-      enable_if:
-         condition: property
-         property: target.compiler
-         equals_value: ICC_18
-    - type: AppendToEnvironmentVariable
-      variableName: PATH
-      variableValue: ":{{.Env.ICC64_18_PATH}}"
-      enable_if:
-         condition: property
-         property: target.compiler
-         equals_value: ICC_18
-    - type: EnvironmentVariable
-      variableName: QT_MODULE_TO_TEST
-      variableValue: "pyside/pyside-setup"
-      enable_if:
-         condition: property
-         property: features
-         contains_value: LicenseCheck
-
-find_path_to_msvc_compiler: &find_path_to_msvc_compiler
-     type: Group
-     enable_if:
-       condition: property
-       property: host.os
-       equals_value: Windows
-     instructions:
-       - type: EnvironmentVariable
-         variableName: VC_SCRIPT
-         variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
-         enable_if:
-           condition: property
-           property: host.compiler
-           equals_value: MSVC2017
-       - type: EnvironmentVariable
-         variableName: VC_SCRIPT
-         variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio\\2019\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
-         enable_if:
-           condition: property
-           property: host.compiler
-           equals_value: MSVC2019
-       - type: WriteFile
-         fileContents: "call \"{{.Env.VC_SCRIPT}}\" {{.Env.TARGET_ARCHITECTURE}} \r\ncmd /c %*"
-         filename: "c:\\users\\qt\\MSVC.bat"
-         fileMode: 420
-         enable_if:
-           condition: property
-           property: host.os
-           equals_value: Windows
-
-run_instructions: &run_instructions
-     type: Group
-     instructions:
-       - type: ExecuteCommand
-         command: python -u coin_build_instructions.py --os=MacOS --packaging --instdir=/Users/qt/work/install  --targetOs=MacOS --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 300
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: MacOS
-             - condition: property
-               property: features
-               contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute build instructions on osx
-       - type: ExecuteCommand
-         command: python -u coin_build_instructions.py --os=MacOS --instdir=/Users/qt/work/install  --targetOs=MacOS --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 300
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: MacOS
-             - condition: property
-               property: features
-               not_contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute build instructions on osx
-       - type: ExecuteCommand
-         command: python -u coin_build_instructions.py --os=Linux --packaging --instdir=/home/qt/work/install  --targetOs=Linux --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 300
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Linux
-             - condition: property
-               property: features
-               contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute build instructions on Linux
-       - type: ExecuteCommand
-         command: python -u coin_build_instructions.py --os=Linux --instdir=/home/qt/work/install  --targetOs=Linux --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 300
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Linux
-             - condition: property
-               property: features
-               not_contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute build instructions on Linux
-       - type: ExecuteCommand
-         command: c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os=Windows --packaging --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 300
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Windows
-             - condition: property
-               property: features
-               contains_value: Packaging
-             - condition: property
-               property: target.arch
-               equals_property: host.arch
-         userMessageOnFailure: >
-              Failed to execute build instructions on 64 bit Windows
-       - type: ExecuteCommand
-         command: c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 300
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Windows
-             - condition: property
-               property: features
-               not_contains_value: Packaging
-             - condition: property
-               property: target.arch
-               equals_property: host.arch
-         userMessageOnFailure: >
-              Failed to execute build instructions on 64 bit Windows
-       - type: ExecuteCommand
-         command: c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os=Windows --packaging --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 300
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Windows
-             - condition: property
-               property: features
-               contains_value: Packaging
-             - condition: property
-               property: target.arch
-               equals_value: X86
-         userMessageOnFailure: >
-              Failed to execute 32 bit build instructions on 64 bit Windows
-       - type: ExecuteCommand
-         command: c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 300
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Windows
-             - condition: property
-               property: features
-               not_contains_value: Packaging
-             - condition: property
-               property: target.arch
-               equals_value: X86
-         userMessageOnFailure: >
-              Failed to execute 32 bit build instructions on 64 bit Windows
-run_test_instructions: &run_test_instructions
-     type: Group
-     enable_if:
-       condition: property
-       property: features
-       not_contains_value: LicenseCheck
-     instructions:
-       - type: EnvironmentVariable
-         variableName: QTEST_ENVIRONMENT
-         variableValue: "ci"
-       - type: ExecuteCommand
-         command: python -u coin_test_instructions.py --os=MacOS --instdir=/Users/qt/work/install  --targetOs=MacOS --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 7200
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: MacOS
-             - condition: property
-               property: features
-               not_contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute test instructions on osx
-       - type: ExecuteCommand
-         command: python -u coin_test_instructions.py --packaging --os=MacOS --instdir=/Users/qt/work/install  --targetOs=MacOS --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 7200
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: MacOS
-             - condition: property
-               property: features
-               contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute test instructions on osx
-       - type: ExecuteCommand
-         command: python -u coin_test_instructions.py --os=Linux --instdir=/home/qt/work/install  --targetOs=Linux --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Linux
-             - condition: property
-               property: features
-               not_contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute test instructions on Linux
-       - type: ExecuteCommand
-         command: python -u coin_test_instructions.py --packaging --os=Linux --instdir=/home/qt/work/install  --targetOs=Linux --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 14400
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Linux
-             - condition: property
-               property: features
-               contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute test instructions on Linux
-       - type: ExecuteCommand
-         command: c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 7200
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Windows
-             - condition: property
-               property: target.arch
-               equals_property: host.arch
-             - condition: property
-               property: features
-               not_contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute test instructions on 64 bit Windows
-       - type: ExecuteCommand
-         command: c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86
-         maxTimeInSeconds: 7200
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Windows
-             - condition: property
-               property: target.arch
-               equals_value: X86
-             - condition: property
-               property: features
-               not_contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute test instructions on 64 bit Windows
-       - type: ExecuteCommand
-         command: c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --packaging --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86_64
-         maxTimeInSeconds: 7200
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Windows
-             - condition: property
-               property: target.arch
-               equals_property: host.arch
-             - condition: property
-               property: features
-               contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute 32 bit test instructions on 64 bit Windows
-       - type: ExecuteCommand
-         command: c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --packaging --os=Windows --instdir=\Users\qt\work\install  --targetOs=Windows --hostArch=X86_64 --targetArch=X86
-         maxTimeInSeconds: 7200
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: and
-           conditions:
-             - condition: property
-               property: host.os
-               equals_value: Windows
-             - condition: property
-               property: target.arch
-               equals_value: X86
-             - condition: property
-               property: features
-               contains_value: Packaging
-         userMessageOnFailure: >
-              Failed to execute 32 bit test instructions on 64 bit Windows
-
-relocate_pyside: &relocate_pyside
-     type: Group
-     enable_if:
-       condition: property
-       property: features
-       not_contains_value: LicenseCheck
-     instructions:
-       - type: ChangeDirectory
-         directory: "{{.AgentWorkingDir}}/pyside"
-         maxTimeInSeconds: 300
-         maxTimeBetweenOutput: 120
-         userMessageOnFailure: >
-              Failed to change to pyside dir
-       - type: ExecuteCommand
-         command: c:\\users\\qt\\MSVC.bat rd /s /q pyside-setup
-         maxTimeInSeconds: 300
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: property
-           property: host.os
-           equals_value: Windows
-         userMessageOnFailure: >
-              Failed to remove pyside-setup dir
-       - type: ExecuteCommand
-         command: /bin/rm -rf pyside-setup
-         maxTimeInSeconds: 300
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: property
-           property: host.os
-           not_equals_value: Windows
-         userMessageOnFailure: >
-              Failed to remove pyside-setup dir
-       - type: InstallBinaryArchive
-         relativeStoragePath: "{{.Env.MODULE_ARTIFACTS_RELATIVE_STORAGE_PATH}}/artifacts.tar.gz"
-         directory: "pyside"
-         maxTimeInSeconds: 1200
-         maxTimeBetweenOutput: 1200
-       - type: ChangeDirectory
-         directory: "{{.AgentWorkingDir}}\\pyside\\pyside-setup"
-         maxTimeInSeconds: 7200
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: property
-           property: host.os
-           equals_value: Windows
-         userMessageOnFailure: >
-              Failed to install binary artifacts
-       - type: ChangeDirectory
-         directory: "{{.AgentWorkingDir}}/pyside/pyside-setup"
-         maxTimeInSeconds: 7200
-         maxTimeBetweenOutput: 120
-         enable_if:
-           condition: property
-           property: host.os
-           not_equals_value: Windows
-         userMessageOnFailure: >
-              Failed to change to pyside-setup dir
-
 upload_pyside: &upload_pyside
      type: Group
      instructions:
@@ -506,44 +55,14 @@ upload_pyside: &upload_pyside
 
 instructions:
      LicenseCheck:
-       - type: ChangeDirectory
-         directory: "{{.AgentWorkingDir}}"
-       - type: InstallSourceArchive
-         maxTimeInSeconds: 600
-         maxTimeBetweenOutput: 600
-         project: qt/qtbase
-         ref: 5.14
-         directory: qt/qtbase
-         userMessageOnFailure: >
-                 Could not install source archive. Please investigate why.
-       - type: InstallSourceArchive
-         maxTimeInSeconds: 600
-         maxTimeBetweenOutput: 600
-         project: qt/qtqa
-         ref: master
-         directory: qt/qtqa-latest
-         userMessageOnFailure: >
-                 Could not install source archive. Please investigate why.
-       - type: EnvironmentVariable
-         variableName: QT_MODULE_TO_TEST
-         variableValue: pyside/pyside-setup
-         userMessageOnFailure: >
-                 Failed to set environment variable. This should not happen.
-       - type: ExecuteCommand
-         command: perl qt/qtqa-latest/tests/prebuild/license/tst_licenses.pl
-         maxTimeInSeconds: 7200
-         maxTimeBetweenOutput: 120
-         userMessageOnFailure: >
-              Failed to run license check script.
-
+      - !include "{{pyside/pyside-setup}}/execute_license_check.yaml"
      Build:
-      - *set_environment
-      - *find_path_to_msvc_compiler
-      - *run_instructions
+      - !include "{{pyside/pyside-setup}}/common_environment.yaml"
+      - !include "{{pyside/pyside-setup}}/find_path_to_msvc_compiler.yaml"
+      - !include "{{pyside/pyside-setup}}/execute_build_instructions.yaml"
       - *upload_pyside
      Test:
-      - *set_environment
-      - *find_path_to_msvc_compiler
-      - *relocate_pyside
-      - *run_test_instructions
-
+      - !include "{{pyside/pyside-setup}}/common_environment.yaml"
+      - !include "{{pyside/pyside-setup}}/find_path_to_msvc_compiler.yaml"
+      - !include "{{pyside/pyside-setup}}/relocate_pyside.yaml"
+      - !include "{{pyside/pyside-setup}}/execute_test_instructions.yaml"