From fdccee5ee52860614ef12f6994439e0f2ca6c98d Mon Sep 17 00:00:00 2001 From: Dmitry Burmistrov Date: Wed, 28 Sep 2016 17:40:09 +0300 Subject: [PATCH] [build] Separate host parameter for CRs Implement seperate parameter which defines remote host for review repository Change-Id: Ibe6ca531c284e0586cbeabd774ee42d26109f3ae Related-Bug: #1628470 --- perestroika/build-deb.sh | 3 ++- perestroika/build-rpm.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/perestroika/build-deb.sh b/perestroika/build-deb.sh index 057fb70..3825ff0 100755 --- a/perestroika/build-deb.sh +++ b/perestroika/build-deb.sh @@ -165,6 +165,7 @@ main () { if [ "$GERRIT_CHANGE_STATUS" == "NEW" ] && [ -n "$LP_BUG" -o -n "$CUSTOM_REPO_ID" ] ; then local DEB_REQUEST_REPO_PATH=${DEB_REQUEST_REPO_PATH:-$DEB_REPO_PATH} + local REMOTE_REQUEST_REPO_HOST=${REMOTE_REQUEST_REPO_HOST:-$REMOTE_REPO_HOST} case true in "$IS_HOTFIX" ) local DEB_REQUEST_DIST_NAME=$DEB_HOTFIX_DIST_NAME @@ -179,7 +180,7 @@ main () { local DEB_REQUEST_DIST_NAME=$DEB_DIST_NAME ;; esac - EXTRAREPO="${EXTRAREPO}|http://${REMOTE_REPO_HOST}/${REPO_REQUEST_PATH_PREFIX}/${REQUEST}/${DEB_REQUEST_REPO_PATH} ${DEB_REQUEST_DIST_NAME} ${COMPONENTS}" + EXTRAREPO="${EXTRAREPO}|http://${REMOTE_REQUEST_REPO_HOST}/${REPO_REQUEST_PATH_PREFIX}/${REQUEST}/${DEB_REQUEST_REPO_PATH} ${DEB_REQUEST_DIST_NAME} ${COMPONENTS}" fi export EXTRAREPO diff --git a/perestroika/build-rpm.sh b/perestroika/build-rpm.sh index fbe6fe8..47aeeee 100755 --- a/perestroika/build-rpm.sh +++ b/perestroika/build-rpm.sh @@ -153,6 +153,7 @@ This package provides the %{-n*} kernel modules esac if [ "$GERRIT_CHANGE_STATUS" == "NEW" ] && [ -n "$LP_BUG" -o -n "$CUSTOM_REPO_ID" ] ; then + local REMOTE_REQUEST_REPO_HOST=${REMOTE_REQUEST_REPO_HOST:-$REMOTE_REPO_HOST} local RPM_REQUEST_HOTFIX_REPO_PATH=${RPM_REQUEST_HOTFIX_REPO_PATH:-$RPM_HOTFIX_REPO_PATH} local RPM_REQUEST_SECURITY_REPO_PATH=${RPM_REQUEST_SECURITY_REPO_PATH:-$RPM_SECURITY_REPO_PATH} local RPM_REQUEST_PROPOSED_REPO_PATH=${RPM_REQUEST_PROPOSED_REPO_PATH:-$RPM_PROPOSED_REPO_PATH} @@ -171,7 +172,7 @@ This package provides the %{-n*} kernel modules local RPM_REQUEST_REPO_PATH=$RPM_REQUEST_OS_REPO_PATH ;; esac - EXTRAREPO="${EXTRAREPO}|repo5,http://${REMOTE_REPO_HOST}/${REPO_REQUEST_PATH_PREFIX}/${REQUEST}/${RPM_REQUEST_REPO_PATH}/x86_64" + EXTRAREPO="${EXTRAREPO}|repo5,http://${REMOTE_REQUEST_REPO_HOST}/${REPO_REQUEST_PATH_PREFIX}/${REQUEST}/${RPM_REQUEST_REPO_PATH}/x86_64" fi export EXTRAREPO