-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
+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