From cb68a2196dfeab6eacfa123e3da8fb7e1feb3385 Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Mon, 24 Aug 2015 10:26:49 +0200 Subject: [PATCH] Release: Prevent running whole lifecycle twice --- dev-tools/prepare_release_candidate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-tools/prepare_release_candidate.py b/dev-tools/prepare_release_candidate.py index b22885ad536..b6909cba178 100644 --- a/dev-tools/prepare_release_candidate.py +++ b/dev-tools/prepare_release_candidate.py @@ -223,10 +223,10 @@ if __name__ == "__main__": shutil.rmtree(localRepoElasticsearch) if install_only: - mvn_targets = 'install' + mvn_target = 'install' else: - mvn_targets = 'install deploy' - install_command = 'mvn clean %s -Prelease -Dskip.integ.tests=true -Dgpg.keyname="%s" -Dpackaging.rpm.rpmbuild=/usr/bin/rpmbuild -Drpm.sign=true -Dmaven.repo.local=%s -Dno.commit.pattern="\\bno(n|)commit\\b" -Dforbidden.test.signatures=""' % (mvn_targets, gpg_key, localRepo) + mvn_target = 'deploy' + install_command = 'mvn clean %s -Prelease -Dskip.integ.tests=true -Dgpg.keyname="%s" -Dpackaging.rpm.rpmbuild=/usr/bin/rpmbuild -Drpm.sign=true -Dmaven.repo.local=%s -Dno.commit.pattern="\\bno(n|)commit\\b" -Dforbidden.test.signatures=""' % (mvn_target, gpg_key, localRepo) clean_repo_command = 'find %s -name _remote.repositories -exec rm {} \;' % (localRepoElasticsearch) rename_metadata_files_command = 'for i in $(find %s -name "maven-metadata-local.xml*") ; do mv "$i" "${i/-local/}" ; done' % (localRepoElasticsearch) s3_sync_command = 's3cmd sync %s s3://download.elasticsearch.org/elasticsearch/staging/%s-%s/org/' % (localRepoElasticsearch, release_version, shortHash)