# - Author name in Nordix Gerrit equals LFID i.e. need to run "git config --global user.name <LFID>"
# - 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
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
+git reset HEAD~1 --soft
+git checkout -b delivery_branch origin/$BRANCH
-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
+git config --get remote.upstream.url
+retVal=$?
+
+if [[ $retVal -eq 0 ]]
+then
+ git remote rm upstream
+ git remote add upstream "ssh://$username@gerrit.onap.org:29418/$project.git"
+else
+ git remote add upstream "ssh://$username@gerrit.onap.org:29418/$project.git"
+fi
echo "Committing changes and pushing upstream"
git commit -as -m "$message"
-git push upstream HEAD:refs/for/master
+git push upstream HEAD:refs/for/$BRANCH
-retVal=$?
-if [[ $retVal -eq 0 ]]
+retVal1=$?
+if [[ $retVal1 -eq 0 ]]
then
echo "Push upstream to ONAP succeeded"
else
echo "Push upstream to ONAP failed"
exit 2
fi
+
+git checkout $BRANCH
+git branch -D delivery_branch