diff --git a/coin/instructions/coin_module_test_template_v2.yaml b/coin/instructions/coin_module_test_template_v2.yaml index 37765846892..6b69763c99b 100644 --- a/coin/instructions/coin_module_test_template_v2.yaml +++ b/coin/instructions/coin_module_test_template_v2.yaml @@ -1,5 +1,12 @@ type: Group instructions: + - type: Group + instructions: + - !include "{{qt/qtbase}}/run_license_check.yaml" + enable_if: + condition: property + property: features + contains_value: LicenseCheckV2 - type: Group instructions: - !include "{{qt/qtbase}}/coin_module_test_template_common.yaml" @@ -19,6 +26,11 @@ instructions: property: target.osVersion in_values: [QEMU, QNX_710] disable_if: - condition: property - property: features - contains_value: DisableTests + condition: or + conditions: + - condition: property + property: features + contains_value: DisableTests + - condition: property + property: features + contains_value: LicenseCheckV2 diff --git a/coin/instructions/coin_module_test_template_v3.yaml b/coin/instructions/coin_module_test_template_v3.yaml index 83b40c141b0..712389fdace 100644 --- a/coin/instructions/coin_module_test_template_v3.yaml +++ b/coin/instructions/coin_module_test_template_v3.yaml @@ -1,5 +1,12 @@ type: Group instructions: + - type: Group + instructions: + - !include "{{qt/qtbase}}/run_license_check.yaml" + enable_if: + condition: property + property: features + contains_value: LicenseCheckV2 - type: Group instructions: - !include "{{qt/qtbase}}/coin_module_test_template_common.yaml" @@ -19,6 +26,11 @@ instructions: property: features contains_value: AndroidTestRun disable_if: - condition: property - property: features - contains_value: DisableTests + condition: or + conditions: + - condition: property + property: features + contains_value: DisableTests + - condition: property + property: features + contains_value: LicenseCheckV2 diff --git a/coin/instructions/run_license_check.yaml b/coin/instructions/run_license_check.yaml new file mode 100644 index 00000000000..da1ec04254a --- /dev/null +++ b/coin/instructions/run_license_check.yaml @@ -0,0 +1,23 @@ +type: Group +instructions: + - type: ChangeDirectory + directory: "{{.AgentWorkingDir}}" + - type: InstallSourceArchive + maxTimeInSeconds: 600 + maxTimeBetweenOutput: 600 + project: qt/qtqa + ref: dev + directory: qt/qtqa-latest + userMessageOnFailure: > + Could not install qtqa source archive. Please investigate why. + - type: EnvironmentVariable + variableName: QT_MODULE_TO_TEST + variableValue: "{{.SourceDir}}" + userMessageOnFailure: > + Failed to set QT_MODULE_TO_TEST 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.