diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2016-12-12 07:35:29 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2016-12-12 08:12:44 +0000 |
| commit | f88f547228336bd3e075599b54954bbfca12319d (patch) | |
| tree | 53c772431d3ec18567533042004c95d3dfa77c7a | |
| parent | 6ca192ee00a850660efdc3c71cd023fb822f3f21 (diff) | |
Do not form production folders for online repositories automaticallyv5.7.1-packaging
Use corresponding environment variables directly. Do not try to
form the paths automatically. We may have pre-defined work directories
on production server which we can not change thus this logic would
not work in the first place.
Change-Id: I8846486ee59edcc4bf8e358589008d12f5206d30
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| -rw-r--r-- | packaging-tools/batch_process_installer_bld.py | 5 | ||||
| -rw-r--r-- | packaging-tools/localbuild.ini | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/packaging-tools/batch_process_installer_bld.py b/packaging-tools/batch_process_installer_bld.py index a71acb08a..6ba1f197b 100644 --- a/packaging-tools/batch_process_installer_bld.py +++ b/packaging-tools/batch_process_installer_bld.py @@ -590,10 +590,7 @@ def init_env(optionDict): optionDict['REPO_STAGING_SERVER_TEST_REPO'] = optionDict['STAGING_SRV_ONLINE_REPO_BASE_PATH'] + '/' + optionDict['LICENSE'] + '/staging' optionDict['REPO_STAGING_SERVER_TEST_REPO_PENDING'] = optionDict['STAGING_SRV_ONLINE_REPO_BASE_PATH'] + '/' + optionDict['LICENSE'] + '/staging_pending' optionDict['REPO_STAGING_SERVER_HOME_TOOLS'] = optionDict['REPO_STAGING_SERVER_HOME'] + '/qtsdk/packaging-tools' - # Production specific - optionDict['PROD_SRV_REPO_BASE_PATH'] = optionDict['STAGING_SRV_ONLINE_REPO_BASE_PATH'] + '/' + optionDict['LICENSE'] + '/production' - optionDict['PROD_SRV_REPO_PENDING_AREA_DIR'] = optionDict['STAGING_SRV_ONLINE_REPO_BASE_PATH'] + '/' + optionDict['LICENSE'] + '/production_pending' - optionDict['REPO_STAGING_SERVER_TEST_REPO_DIST_WORK'] = optionDict['STAGING_SRV_ONLINE_REPO_BASE_PATH'] + '/' + optionDict['LICENSE'] + '/production_dist_update_work' + # Production specific directories are set directly from environment onlineRepositoryBaseName = os.environ.get('ONLINE_REPOSITORY_BASE_NAME') optionDict['ONLINE_REPOSITORY_BASE_NAME'] = onlineRepositoryBaseName if onlineRepositoryBaseName else 'qtsdkrepository' diff --git a/packaging-tools/localbuild.ini b/packaging-tools/localbuild.ini index 9285e789f..8fa3206b5 100644 --- a/packaging-tools/localbuild.ini +++ b/packaging-tools/localbuild.ini @@ -51,7 +51,9 @@ REPO_STAGING_SERVER_HOME= %(home)s/dev DO_UPDATE_PRODUCTION_REPOSITORY= yes PROD_USER= %(user)s PROD_ADDR= 127.0.0.1 -PROD_SRV_REPO_BASE_PATH= %(home)s/build/online_repository +PROD_SRV_REPO_BASE_PATH= %(home)s/build/online_repository/production +PROD_SRV_REPO_PENDING_AREA_DIR= %(home)s/build/online_repository/production_pending +REPO_STAGING_SERVER_TEST_REPO_DIST_WORK= %(home)s/build/online_repository/production_dist_update_work [QtCreator.Build] QT_CREATOR_GIT_URL= ssh://codereview.qt-project.org:29418/qt-creator/qt-creator.git |