diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml index 3110b3b3fea..0332c511323 100644 --- a/coin/instructions/build.yaml +++ b/coin/instructions/build.yaml @@ -148,7 +148,7 @@ instructions: equals_value: Windows - type: UploadArtifact - archiveDirectory: "{{.AgentWorkingDir}}" + archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build" transferType: UploadModuleBuildArtifact maxTimeInSeconds: 1800 maxTimeBetweenOutput: 1800 diff --git a/coin/instructions/test.yaml b/coin/instructions/test.yaml index 7786d75f5ed..c66442585e4 100644 --- a/coin/instructions/test.yaml +++ b/coin/instructions/test.yaml @@ -1,5 +1,11 @@ type: Group instructions: + - type: InstallBinaryArchive + relativeStoragePath: "{{.Env.MODULE_ARTIFACTS_RELATIVE_STORAGE_PATH}}/artifacts.tar.gz" + directory: "qt-creator/qt-creator_build/build" + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 1800 + userMessageOnFailure: "Failed to unarchive build artifacts, check logs" - type: ChangeDirectory directory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build" - type: ExecuteCommand diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 3bd2ef9113f..96428853f26 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -66,6 +66,7 @@ make_instructions: &make_instructions test_instructions: &test_instructions type: Group instructions: + - !include "{{qt-creator/qt-creator}}/provision.yaml" - !include "{{qt-creator/qt-creator}}/test.yaml" instructions: @@ -74,6 +75,7 @@ instructions: - *make_instructions Test: + - *common_environment - *test_instructions LicenseCheck: