From 3fdcd619e63905d6a47a13a345a243ac30d212ec Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 28 May 2020 08:55:32 -0400 Subject: [PATCH] Default CSIT to master branch Added "defaultbranch=master" to .gitreview file. Also modified Policy CSITs to get the branch from the .gitreview file instead of hard-coding it in a config file. Issue-ID: POLICY-2597 Change-Id: I05e969d3efdaf09c4fca4012131983ca26423ab0 Signed-off-by: Jim Hahn --- .gitreview | 1 + scripts/policy/config/policy-csit.conf | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index e6c21d17..a7d8b804 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=gerrit.onap.org port=29418 project=integration/csit.git +defaultbranch=master diff --git a/scripts/policy/config/policy-csit.conf b/scripts/policy/config/policy-csit.conf index 1858698a..95c14504 100644 --- a/scripts/policy/config/policy-csit.conf +++ b/scripts/policy/config/policy-csit.conf @@ -1,3 +1,7 @@ -GERRIT_BRANCH=master POLICY_MARIADB_VER=10.2.25 NEXUS_URL=https://nexus.onap.org/content/repositories/snapshots + +GIT_TOP=$(git rev-parse --show-toplevel) +GERRIT_BRANCH=$(awk -F= '$1 == "defaultbranch" { print $2 }' \ + "${GIT_TOP}"/.gitreview) +echo GERRIT_BRANCH=${GERRIT_BRANCH} -- 2.16.6