From 589f4c04a40cf08a501ae6015b5b322da64abf83 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 14 Aug 2018 15:35:52 -0500
Subject: [PATCH] Attempting to fix jetty-9.2.x build

---
 Jenkinsfile | 124 ++++++++++------------------------------------------
 1 file changed, 24 insertions(+), 100 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f7760dc3152..8a34460cef1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,62 +13,42 @@ node {
   List mvnEnv = ["PATH+MVN=${mvntool}/bin", "PATH+JDK=${jdktool}/bin", "JAVA_HOME=${jdktool}/", "MAVEN_HOME=${mvntool}"]
   mvnEnv.add("MAVEN_OPTS=$mavenOpts")
 
-  try
-  {
-    stage('Checkout') {
-      checkout scm
-    }
-  } catch (Exception e) {
-    notifyBuild("Checkout Failure")
-    throw e
+  stage('Checkout') {
+    checkout scm
   }
 
-  try
-  {
-    stage('Compile') {
-      withEnv(mvnEnv) {
-        timeout(time: 15, unit: 'MINUTES') {
-          withmaven(
-              maven: mvnName,
-              jdk: "$jdk",
-              publisherStrategy: 'EXPLICIT',
-              globalMavenSettingsConfig: settingsName,
-              mavenOpts: mavenOpts,
-              mavenLocalRepo: localRepo) {
-            sh "mvn -B clean install -Dtest=None"
-          }
+  stage('Compile') {
+    withEnv(mvnEnv) {
+      timeout(time: 15, unit: 'MINUTES') {
+        withmaven(
+            maven: mvnName,
+            jdk: "$jdk",
+            publisherStrategy: 'EXPLICIT',
+            globalMavenSettingsConfig: settingsName,
+            mavenOpts: mavenOpts,
+            mavenLocalRepo: localRepo) {
+          sh "mvn -B clean install -Dtest=None"
         }
       }
     }
-  } catch(Exception e) {
-    notifyBuild("Compile Failure")
-    throw e
   }
 
-  try
-  {
-    stage('Javadoc') {
-      withEnv(mvnEnv) {
-        timeout(time: 15, unit: 'MINUTES') {
-          withmaven(
-              maven: mvnName,
-              jdk: "$jdk",
-              publisherStrategy: 'EXPLICIT',
-              globalMavenSettingsConfig: settingsName,
-              mavenOpts: mavenOpts,
-              mavenLocalRepo: localRepo) {
-            sh "mvn -B javadoc:javadoc"
-          }
+  stage('Javadoc') {
+    withEnv(mvnEnv) {
+      timeout(time: 15, unit: 'MINUTES') {
+        withmaven(
+            maven: mvnName,
+            jdk: "$jdk",
+            publisherStrategy: 'EXPLICIT',
+            globalMavenSettingsConfig: settingsName,
+            mavenOpts: mavenOpts,
+            mavenLocalRepo: localRepo) {
+          sh "mvn -B javadoc:javadoc"
         }
       }
     }
-  } catch(Exception e) {
-    notifyBuild("Javadoc Failure")
-    throw e
   }
 
-  try
-  {
     stage('Test') {
       withEnv(mvnEnv) {
         timeout(time: 60, unit: 'MINUTES') {
@@ -118,64 +98,8 @@ node {
                 ]])
             }
         }
-        if(isUnstable())
-        {
-          notifyBuild("Unstable / Test Errors")
-        }
       }
     }
-  } catch(Exception e) {
-    notifyBuild("Test Failure")
-    throw e
-  }
 }
 
-// True if this build is part of the "active" branches
-// for Jetty.
-def isActiveBranch()
-{
-  def branchName = "${env.BRANCH_NAME}"
-  return ( branchName == "master" ||
-      ( branchName.startsWith("jetty-") && branchName.endsWith(".x") ) )
-}
-
-// Test if the Jenkins Pipeline or Step has marked the
-// current build as unstable
-def isUnstable()
-{
-  return currentBuild.result == "UNSTABLE"
-}
-
-// Send a notification about the build status
-def notifyBuild(String buildStatus)
-{
-  if ( !isActiveBranch() )
-  {
-    // don't send notifications on transient branches
-    return
-  }
-
-  // default the value
-  buildStatus = buildStatus ?: "UNKNOWN"
-
-  def email = "${env.EMAILADDRESS}"
-  def summary = "${env.JOB_NAME}#${env.BUILD_NUMBER} - ${buildStatus}"
-  def detail = """<h4>Job: <a href='${env.JOB_URL}'>${env.JOB_NAME}</a> [#${env.BUILD_NUMBER}]</h4>
-  <p><b>${buildStatus}</b></p>
-  <table>
-    <tr><td>Build</td><td><a href='${env.BUILD_URL}'>${env.BUILD_URL}</a></td><tr>
-    <tr><td>Console</td><td><a href='${env.BUILD_URL}console'>${env.BUILD_URL}console</a></td><tr>
-    <tr><td>Test Report</td><td><a href='${env.BUILD_URL}testReport/'>${env.BUILD_URL}testReport/</a></td><tr>
-  </table>
-  """
-
-  emailext (
-    to: email,
-    subject: summary,
-    body: detail
-  )
-
-}
-
-
 // vim: et:ts=2:sw=2:ft=groovy