From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 11 Dec 2018 19:30:08 +0000 (-0800)
Subject: Fix branches to pull and rebase against
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=6634be56af71463d16c4325d242bad394b8b34db;p=infra%2Fcicd.git

Fix branches to pull and rebase against

The previous version of the jobs were misconfigured, trying to rebase
nordix-dev and nordix-casablanca branches which is incorrect.

The branches that are kept in sync are master and casablanca so
this change fixes that.

Change-Id: I0aebf3adb62e504dc1c19cd4931a45d9330d53bc
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
---

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-rebase-jobs.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-rebase-jobs.yaml
index 4e17f38b5..66ac0bdbc 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile-rebase-jobs.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-rebase-jobs.yaml
@@ -10,12 +10,10 @@
     project-name: dcaegen2-collectors-datafile
 
     stream:
-      - nordix-dev:
+      - master:
           branch: '{stream}'
-          upstream-branch: 'master'
-      - nordix-casablanca:
+      - casablanca:
           branch: '{stream}'
-          upstream-branch: 'casablanca'
 
     jobs:
       - '{project-name}-{stream}-rebase'
diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml
index 19c3af710..843175e60 100644
--- a/jjb/global/global-templates-rebase.yaml
+++ b/jjb/global/global-templates-rebase.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: '{project-name}-{stream}-rebase'
 
-    node: ubuntu1804
+    node: infra-build01-ubuntu1804
 
     disabled: false
 
@@ -16,21 +16,17 @@
           name: NORDIX_REMOTE
           default: 'ssh://infra@gerrit.nordix.org:29418/{project}.git'
           description: The remote to add for Nordix.
-      - string:
-          name: UPSTREAM_BRANCH
-          default: '{upstream-branch}'
-          description: The upstream branch to rebase against.
 
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-lfn-gerrit-ssh
-          branch: "$UPSTREAM_BRANCH"
+          branch: '{branch}'
           refspec: ''
 
     triggers:
       - onap-gerrit-trigger-change-merged:
           project: '{project}'
-          branch: "$UPSTREAM_BRANCH"
+          branch: '{branch}'
           files: '**'
 
     builders:
diff --git a/jjb/global/rebase-jobs.sh b/jjb/global/rebase-jobs.sh
index b451f5fc9..b2f77378b 100755
--- a/jjb/global/rebase-jobs.sh
+++ b/jjb/global/rebase-jobs.sh
@@ -4,16 +4,17 @@ set -o nounset
 set -o pipefail
 
 cd $WORKSPACE
-git checkout $UPSTREAM_BRANCH -q
+echo "Checking out $BRANCH"
+git checkout $BRANCH -q
 git pull -q
 echo "Commit is"
 echo "-------------------------------------------"
 git show -s
 echo "-------------------------------------------"
-echo "Adding new remote for sync"
+echo "Adding new remote $NORDIX_REMOTE for sync"
 git remote add nordix $NORDIX_REMOTE
 echo "-------------------------------------------"
 git remote -v
 echo "-------------------------------------------"
-echo "Pushing changes to Nordix BRANCH"
+echo "Pushing changes to Nordix branch $BRANCH"
 git push nordix $BRANCH