Commit c1cd12ac authored by Raphael Defosseux's avatar Raphael Defosseux

fixing merge request process

Signed-off-by: Raphael Defosseux's avatarRaphael Defosseux <>
parent 9226e19e
......@@ -26,8 +26,8 @@ pipeline {
echo "GitLab tar branch is ${env.gitlabTargetBranch}"
// GitLab-Jenkins pugin integration is lacking to perform the merge by itself
// Doing it manually --> it may have merge conflicts
sh "./scripts/ ${GIT_COMMIT} ${env.gitlabTargetBranch}"
sh "./scripts/ ${GIT_COMMIT} ${env.gitlabTargetBranch}"
sh "./scripts/ ${env.gitlabSourceBranch} ${env.gitlabTargetBranch} ${GIT_COMMIT}"
sh "./scripts/ ${env.gitlabSourceBranch} ${env.gitlabTargetBranch}"
} else {
sh "./scripts/"
echo "Initial Commit is : $INIT_COMMIT"
echo "Source Branch is : $SOURCE_BRANCH"
echo "Target Branch is : $TARGET_BRANCH"
echo "Target Branch is : $TARGET_BRANCH"
echo "Target CommID is : $TARGET_COMMIT_ID"
git checkout origin/$TARGET_BRANCH
git config ""
git config "OAI Jenkins"
git merge --ff $INIT_COMMIT -m "Temporary merge for CI"
SOURCE_INIT_COMMIT=`cat .git/refs/remotes/origin/$SOURCE_BRANCH`
git checkout -f $SOURCE_INIT_COMMIT
git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment