X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fpush-upstream-jobs.sh;fp=jjb%2Fglobal%2Fpush-upstream-jobs.sh;h=3eedac2cb1329c42697df990e8b0399b09d6ed80;hb=f661d05a8b0c51f95e443e9066a3f70965a203db;hp=7c66bdd023d9a07effd74f0775fe610e1c69c43f;hpb=2de417599786a0d9a2ea1ce3f95f4cbdd40fe7cf;p=infra%2Fcicd.git diff --git a/jjb/global/push-upstream-jobs.sh b/jjb/global/push-upstream-jobs.sh index 7c66bdd0..3eedac2c 100755 --- a/jjb/global/push-upstream-jobs.sh +++ b/jjb/global/push-upstream-jobs.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # ============LICENSE_START======================================================= # Copyright (C) 2019 The Nordix Foundation. All rights reserved. @@ -24,9 +24,12 @@ # - Author name in Nordix Gerrit equals LFID i.e. need to run "git config --global user.name " # - infra public key on build server needs to be added to your users SSH Public Keys in ONAP Gerrit # +set -o errexit +set -o nounset +set -o pipefail cd $WORKSPACE - +echo "Retrieving information from commit to push towards ONAP" project=$(git config --local remote.origin.url | awk -F "29418/" '{print $2}') message=$(git show -s --pretty=%B | grep -vi 'Signed-off-by') username=$(git show -s --pretty=%an) @@ -38,9 +41,11 @@ then exit 1 fi +echo "Setting user name and email" git config user.email $(git show -s --pretty=%ae) git config user.name $username +echo "Checking out branch on master with new changes" git reset HEAD~1 git checkout -b delivery_branch origin/master @@ -48,9 +53,10 @@ echo '[remote "upstream"]' >> $WORKSPACE/.git/config echo " url = ssh://$username@gerrit.onap.org:29418/$project.git" >> $WORKSPACE/.git/config echo " fetch = +refs/heads/*:refs/remotes/upstream/*" >> $WORKSPACE/.git/config +echo "Committing changes and pushing upstream" git commit -as -m "$message" - git push upstream HEAD:refs/for/master + retVal=$? if [[ $retVal -eq 0 ]] then