Merge branch 'jetty-12.0.x' into jetty-12.1.x

Author: olamy

Jenkinsfile

@@ -9,9 +9,6 @@ pipeline {
     buildDiscarder logRotator( numToKeepStr: '40' )
     disableRestartFromStage()
   }
-  environment {
-    LAUNCHABLE_TOKEN = credentials('launchable-token')
-  }
   stages {
     stage("Parallel Stage") {
       parallel {
@@ -125,8 +122,6 @@ def mavenBuild(jdk, cmdline, mvnName) {
               extraArgs = " -Dmaven.test.failure.ignore=true "
             }
           }
-          runLaunchable ("verify")
-          runLaunchable ("record build --name jetty-12.1.x")
           dashProfile = ""
           if(useEclipseDash()) {
             dashProfile = " -Peclipse-dash "
@@ -140,9 +135,7 @@ def mavenBuild(jdk, cmdline, mvnName) {
     }
     finally
     {
-      junit testDataPublishers: [[$class: 'JUnitFlakyTestDataPublisher']], testResults: '**/target/surefire-reports/**/*.xml,**/target/invoker-reports/TEST*.xml', allowEmptyResults: true
-      echo "Launchable record tests"
-      runLaunchable ("record tests --build jetty-12.1.x maven '**/target/surefire-reports/**/*.xml' '**/target/invoker-reports/TEST*.xml'")
+      junit testResults: '**/target/surefire-reports/**/*.xml,**/target/invoker-reports/TEST*.xml', allowEmptyResults: true
     }
   }
 }
@@ -187,17 +180,5 @@ def websiteBuild() {
     }
   }
 }
-/**
- * run launchable with args and ignore any errors
- * @param args
- */
-def runLaunchable(args) {
-  try {
-    sh "launchable $args"
-  } catch (Exception e) {
-    e.printStackTrace()
-    echo "skip failure running Launchable: " + e.getMessage()
-  }
-}
 
 // vim: et:ts=2:sw=2:ft=groovy