[trafficserver-ci] branch main updated: Update freebsd.pipeline to merge up to latest upstream (#239)

[bneradt]

This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git


The following commit(s) were added to refs/heads/main by this push:
     new 70d7d21  Update freebsd.pipeline to merge up to latest upstream (#239)
70d7d21 is described below

commit 70d7d212457da3bbf46260554d28a88940c1773c
Author: Brian Neradt <brian.ner...@gmail.com>
AuthorDate: Mon Oct 16 16:23:13 2023 -0500

    Update freebsd.pipeline to merge up to latest upstream (#239)
    
    Evan just did this for osx.pipeline, applying it now to
    freebsd.pipeline. This way re-runs of freebsd.pipeline will always run
    with the latest rebase on top of the target branch.
---
 jenkins/github/freebsd.pipeline | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/jenkins/github/freebsd.pipeline b/jenkins/github/freebsd.pipeline
index fcfcd11..34ef138 100644
--- a/jenkins/github/freebsd.pipeline
+++ b/jenkins/github/freebsd.pipeline
@@ -7,11 +7,24 @@ pipeline {
                     echo "${sha1}"
                     checkout([$class: 'GitSCM',
                         branches: [[name: sha1]],
-                        extensions: [],
-                        
//+refs/pull/${GITHUB_PR_NUMBER}/merge:refs/remotes/origin-pull/pull/${GITHUB_PR_NUMBER}/merge
+                        extensions: [
+                            // We have to set an idenity for the merge step 
because Git requires
+                            // the user.name and user.email to be set to do a 
merge.
+                            [$class: "UserIdentity",
+                                name: "ATS CI User",
+                                email: "nore...@trafficserver.apache.org"
+                            ],
+                            [$class: "PreBuildMerge",
+                                options: [
+                                    mergeTarget: "${GITHUB_PR_TARGET_BRANCH}",
+                                    fastForwardMode: "NO_FF",
+                                    mergeRemote: "origin",
+                                    mergeStrategy: "DEFAULT"
+                                ]
+                            ],
+                        ],
                         userRemoteConfigs: [[url: github_url, refspec: 
'+refs/pull/*:refs/remotes/origin/pr/*']]])
-                        //userRemoteConfigs: [[url: 
'https://github.com/ezelkow1/trafficserver', refspec: 
'+refs/pull/*:refs/remotes/origin/pr/*']]])
-                        //userRemoteConfigs: [[url: 
'https://github.com/ezelkow1/trafficserver', refspec: 
'+refs/pull/${sha1}/merge:refs/remotes/origin/pull/${sha1}/merge']]])
+                    sh 'git show -n 10 --decorate --graph --oneline --no-patch'
                 }
                 echo 'Finished Cloning'
             }