From 4b830c9b662bc31f5e03797ebb626055d00cd60c Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 1 Dec 2016 14:25:22 +0100 Subject: [PATCH] try with TRAVIS_PULL_REQUEST_SHA --- update/verify_upgrade_db.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/update/verify_upgrade_db.sh b/update/verify_upgrade_db.sh index 517687e3..536e2274 100755 --- a/update/verify_upgrade_db.sh +++ b/update/verify_upgrade_db.sh @@ -55,9 +55,17 @@ printf " Latest tag = ${GREEN}$SHORT_LATEST_TAG${NC}\n" # We need to execute init_qwat.sh from the lastest TAG version in $QWATSERVICETESTCONFORM -printf " Travis branch = ${GREEN}$CURRENT_BRANCH${NC}\n" -printf " Travis PR branch = ${GREEN}$TRAVIS_PULL_REQUEST_BRANCH${NC}\n" +printf " Travis branch = ${GREEN}$TRAVIS_BRANCH${NC}\n" printf " Travis commit = ${GREEN}$TRAVIS_COMMIT${NC}\n" +printf " Travis PR branch = ${GREEN}$TRAVIS_PULL_REQUEST_BRANCH${NC}\n" +printf " Travis PR commit = ${GREEN}$TRAVIS_PULL_REQUEST_SHA${NC}\n" + +if [[ ! -z $TRAVIS_PULL_REQUEST_SHA ]]; then + CURRENT_COMMIT=$TRAVIS_PULL_REQUEST_SHA +else + CURRENT_COMMIT=$TRAVIS_COMMIT +fi + PROPER_LATEST_TAG=$SHORT_LATEST_TAG".0.0" echo "Switching on lastest tag major version ${GREEN}$PROPER_LATEST_TAG)${NC}"