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>
project-name: dcaegen2-collectors-datafile
stream:
project-name: dcaegen2-collectors-datafile
stream:
- upstream-branch: 'master'
- - nordix-casablanca:
- upstream-branch: 'casablanca'
jobs:
- '{project-name}-{stream}-rebase'
jobs:
- '{project-name}-{stream}-rebase'
- job-template:
name: '{project-name}-{stream}-rebase'
- job-template:
name: '{project-name}-{stream}-rebase'
+ node: infra-build01-ubuntu1804
name: NORDIX_REMOTE
default: 'ssh://infra@gerrit.nordix.org:29418/{project}.git'
description: The remote to add for Nordix.
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
scm:
- git-scm:
ssh-credentials-id: nordixinfra-lfn-gerrit-ssh
- branch: "$UPSTREAM_BRANCH"
refspec: ''
triggers:
- onap-gerrit-trigger-change-merged:
project: '{project}'
refspec: ''
triggers:
- onap-gerrit-trigger-change-merged:
project: '{project}'
- branch: "$UPSTREAM_BRANCH"
set -o pipefail
cd $WORKSPACE
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 "-------------------------------------------"
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 "-------------------------------------------"
git remote add nordix $NORDIX_REMOTE
echo "-------------------------------------------"
git remote -v
echo "-------------------------------------------"
-echo "Pushing changes to Nordix BRANCH"
+echo "Pushing changes to Nordix branch $BRANCH"