diff options
| author | Antti Kokko <antti.kokko@qt.io> | 2018-06-12 14:42:49 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@qt.io> | 2018-06-18 06:13:21 +0000 |
| commit | 6acb8a35fbb967258dfe7bc2c761f355b35d8183 (patch) | |
| tree | 209d7c3000afae0be62b55c14b5161d57a5c15df /packaging-tools/build_wrapper.py | |
| parent | 65674218080ff263ac57b65151933fb1f2849e29 (diff) | |
Fix dulpicate offline installer copy to remote serverv5.11.1-packaging
Offline installers were copied twice to 'latest_available' directory.
replace_latest_successful_installer() handles the removal of previous
offline installer and copies the new installer.
Task-number: QTQAINFRA-2007
Change-Id: I9042bf5b00e5325bebdf301b72cd62f8c7c6cc73
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
| -rw-r--r-- | packaging-tools/build_wrapper.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index cbda0ad82..675c2982d 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -1075,9 +1075,8 @@ def handle_installer_build(optionDict, project_name, installer_type): installer_name_final = item[3] # sign sign_installer(installer_output_dir, installer_name, installer_name_base) - # copy installer(s) to various locations: + # copy installer(s) to respective build number directory: remote_copy_installer(optionDict, remote_path_snapshot, installer_name, installer_output_dir, installer_name_final) - remote_copy_installer(optionDict, remote_path_latest_available, installer_name, installer_output_dir, installer_name_final) # Keep only the latest one in the "latest_available" directory i.e. delete the previous one replace_latest_successful_installer(optionDict, installer_name, installer_name_final, remote_path_latest_available, installer_output_dir) # Trigger rta cases @@ -1117,8 +1116,7 @@ def replace_latest_successful_installer(optionDict, installer_name, installer_na cmd_args = [optionDict['SSH_COMMAND'], optionDict['PACKAGE_STORAGE_SERVER_ADDR'], 'rm', '-f', old_installer] bldinstallercommon.do_execute_sub_process(cmd_args, SCRIPT_ROOT_DIR, False) # save new installer to latest_successful directory - cmd_args = [optionDict['SCP_COMMAND'], installer_name, optionDict['PACKAGE_STORAGE_SERVER_ADDR'] + ':' + ls_installer_dir + '/' + installer_name_final] - bldinstallercommon.do_execute_sub_process(cmd_args, installer_output) + remote_copy_installer(optionDict, ls_installer_dir, installer_name, installer_output, installer_name_final) ############################### |