X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Frebase-jobs.sh;h=657ed112dd9500d6c7aed26ef8793a4577bf9c68;hb=d643ea7acf4cd3e57ba89f092d39e0874b8b111c;hp=f124691a73792c6410dc539819eee89c55102ec3;hpb=3459cae8bed399c62af4fd9109c61a3e2edf51b9;p=infra%2Fcicd.git

diff --git a/jjb/global/rebase-jobs.sh b/jjb/global/rebase-jobs.sh
index f124691a..657ed112 100644
--- a/jjb/global/rebase-jobs.sh
+++ b/jjb/global/rebase-jobs.sh
@@ -25,16 +25,18 @@ else
     REMOTE_BRANCHES=${GERRIT_BRANCH}
     git branch -f --track ${GERRIT_BRANCH} origin/${GERRIT_BRANCH}
 fi
-git fetch origin -v
+git fetch origin --tags -v
 echo "-- Adding new remote $NORDIX_REMOTE for sync --"
 git remote add nordix $NORDIX_REMOTE
 git remote -v
 echo "-- Merging changes from Gerrit upstream remote branches to local branch: --"
 for branch in ${REMOTE_BRANCHES}  ; do
-    echo "------ Branch name: ${branch}"
+    echo "--- Branch name: ${branch}"
     git checkout ${branch} -q -f
     git merge origin/${branch} --ff-only --stat
+    echo "------ Pushing changes from branch: ${branch} to Nordix Gerrit"
+    git push nordix -v
+    echo "------ Pushing new tags from branch: ${branch} to Nordix Gerrit"
+    git push nordix --tags -f -v
 done
-echo "-- Pushing changes to Nordix Gerrit --"
-git push nordix --all -v
 echo "--------------------------------------------------------------------"