Cleanup build and test instructions calls

There is no need to specify seprate call for each target/host
arch combination.

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

2 files changed, 29 insertions, 233 deletions

diff --git a/coin/instructions/execute_build_instructions.yaml b/coin/instructions/execute_build_instructions.yaml
index fd65840b9..622a9672f 100644
--- a/coin/instructions/execute_build_instructions.yaml
+++ b/coin/instructions/execute_build_instructions.yaml
@@ -1,134 +1,32 @@
 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
+    command: "python -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install  --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=ALL"
     maxTimeInSeconds: 14400
     maxTimeBetweenOutput: 300
     enable_if:
-      condition: and
-      conditions:
-        - condition: property
-          property: host.os
-          equals_value: MacOS
-        - condition: property
-          property: features
-          contains_value: Packaging
+        condition: property
+        property: host.os
+        equals_value: MacOS
     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
+    command: "python -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/home/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=ALL"
     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
+        condition: property
+        property: host.os
+        equals_value: Linux
     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
+    command: "c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=ALL"
     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
+        condition: property
+        property: host.os
+        equals_value: Windows
     userMessageOnFailure: >
-         Failed to execute 32 bit build instructions on 64 bit Windows
+         Failed to execute build instructions on Windows
diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml
index f4446e85c..87abb476c 100644
--- a/coin/instructions/execute_test_instructions.yaml
+++ b/coin/instructions/execute_test_instructions.yaml
@@ -8,134 +8,32 @@ instructions:
     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
+    command: "python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}"
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 300
     enable_if:
-      condition: and
-      conditions:
-        - condition: property
-          property: host.os
-          equals_value: MacOS
-        - condition: property
-          property: features
-          contains_value: Packaging
+        condition: property
+        property: host.os
+        equals_value: MacOS
     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
+    command: "python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/home/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}"
     maxTimeInSeconds: 14400
-    maxTimeBetweenOutput: 120
+    maxTimeBetweenOutput: 300
     enable_if:
-      condition: and
-      conditions:
-        - condition: property
-          property: host.os
-          equals_value: Linux
-        - condition: property
-          property: features
-          not_contains_value: Packaging
+        condition: property
+        property: host.os
+        equals_value: Linux
     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
+    command: "c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}"
     maxTimeInSeconds: 14400
-    maxTimeBetweenOutput: 120
+    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 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
+        condition: property
+        property: host.os
+        equals_value: Windows
     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