[trafficserver-ci] branch main updated: Update debian.pipeline

[ez...@apache.org]

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

eze 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 9efad6a  Update debian.pipeline
9efad6a is described below

commit 9efad6a7207416063d9de70772a7d3d88d233c8c
Author: Evan Zelkowitz <ez...@apache.org>
AuthorDate: Thu Sep 23 16:56:56 2021 -0600

    Update debian.pipeline
---
 jenkins/github/debian.pipeline | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/jenkins/github/debian.pipeline b/jenkins/github/debian.pipeline
index 444bc22..629d2c0 100644
--- a/jenkins/github/debian.pipeline
+++ b/jenkins/github/debian.pipeline
@@ -4,8 +4,13 @@ pipeline {
             image 'controller.trafficserver.org/ats/debian:10'
             registryUrl 'https://controller.trafficserver.org/'
             label 'docker'
+            args '-v ${HOME}/ccache:/tmp/ccache:rw'
         }
     }
+    environment {
+        CCACHE_DIR = "/tmp/ccache"
+        CCACHE_BASEDIR = "${WORKSPACE}"
+    }    
     stages {
         stage('Clone') {
             steps {
@@ -13,8 +18,24 @@ pipeline {
                     echo "${sha1}"
                     checkout([$class: 'GitSCM',
                         branches: [[name: sha1]],
-                        extensions: [],
+                        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: "noreply@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/*']]])
+                    sh 'git show -n 10 --decorate --graph --oneline --no-patch'
                 }
                 echo 'Finished Cloning'
             }
@@ -23,12 +44,17 @@ pipeline {
             steps {
                 echo 'Starting build'
                 dir('src') {
-                    sh('autoreconf -fiv')
-                    sh('./configure --enable-experimental-plugins --enable-example-plugins --prefix=/tmp/ats/ --with-user=jenkins --enable-debug --enable-werror')
-                    sh('make -j4 V=1 Q=')
-                    sh('make -j 2 check VERBOSE=Y V=1')
-                    sh('make install')
-                    sh('/tmp/ats/bin/traffic_server -K -k -R 1')
+                    // For Jenkins debugging. We comit to the top of README in our debug PRs.
+                    sh('head README')
+                    sh '''#!/bin/bash
+                        set -x
+                        autoreconf -fiv
+                        ./configure --enable-experimental-plugins --enable-example-plugins --prefix=/tmp/ats/ --enable-debug --enable-werror --enable-ccache
+                        make -j4 V=1 Q=
+                        make -j 2 check VERBOSE=Y V=1
+                        make install
+                        /tmp/ats/bin/traffic_server -K -k -R 1
+                    '''
                 }
             }
         }