CI: Fix merge strategy

Change-Id: I5e3fb6adfa6cbf694c0deecf02e3879297b0c12e

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index f4ec711f337bcf7d7072b68116aa46fe12f060b0..9dc7308bece6ace051ce3ef09002cbeeac416d72 100644 (file)
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -80,15 +80,20 @@ pipeline {
                                                checkout scm: [$class: 'GitSCM',
                                                        branches: [[name: env.GERRIT_BRANCH ]],
                                                        extensions: [
+                                                               [$class: 'ScmName', name: 'gerrit-public'],
                                                                [$class: 'CleanBeforeCheckout'],
                                                                [$class: 'PreBuildMerge', options: [
-                                                                       mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
+                                                                       mergeRemote: 'gerrit-public',
+                                                                       fastForwardMode: 'NO_FF',
+                                                                       mergeStrategy: 'RECURSIVE',
+                                                                       mergeTarget: env.GERRIT_BRANCH]],
                                                                [$class: 'CloneOption',
                                                                        honorRefspec: true,
                                                                        noTags: true,
                                                                        depth: 10,
                                                                        shallow: true
                                                                ],
+                                                               [$class: 'PruneStaleBranch'],
                                                                [$class: 'BuildChooserSetting',
                                                                        buildChooser: [$class: 'GerritTriggerBuildChooser']
                                                                ]

diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index d549dbfdc4a457506912839f6308904ea1afd922..767ff9447c65bacfbc7bea0768bcee30f236fc45 100644 (file)
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -81,15 +81,20 @@ pipeline {
                                                checkout scm: [$class: 'GitSCM',
                                                        branches: [[name: env.GERRIT_BRANCH ]],
                                                        extensions: [
+                                                               [$class: 'ScmName', name: 'gerrit-public'],
                                                                [$class: 'CleanBeforeCheckout'],
                                                                [$class: 'PreBuildMerge', options: [
-                                                                       mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
+                                                                       mergeRemote: 'gerrit-public',
+                                                                       fastForwardMode: 'NO_FF',
+                                                                       mergeStrategy: 'RECURSIVE',
+                                                                       mergeTarget: env.GERRIT_BRANCH]],
                                                                [$class: 'CloneOption',
                                                                        honorRefspec: true,
                                                                        noTags: true,
                                                                        depth: 10,
                                                                        shallow: true
                                                                ],
+                                                               [$class: 'PruneStaleBranch'],
                                                                [$class: 'BuildChooserSetting',
                                                                        buildChooser: [$class: 'GerritTriggerBuildChooser']
                                                                ]