Jenkins pipelines refresh (#1233)

JDK upgrade, post build actions to capture compiler, JavaDoc, SpotBugs messages. Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
eclipse-ee4j · Aug 6, 2021 · 60ccb27 · 60ccb27
1 parent 44f8f2c
commit 60ccb27
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 30 deletions.
diff --git a/etc/jenkins/build.groovy b/etc/jenkins/build.groovy
@@ -101,7 +101,7 @@ spec:
     }
     tools {
         maven 'apache-maven-latest'
-        jdk 'adoptopenjdk-hotspot-jdk11-latest'
+        jdk 'openjdk-jdk17-latest'
     }
     stages {
         // Initialize build environment
@@ -183,32 +183,31 @@ spec:
                 }
             }
         }
-        stage('Proceed test results') {
-            steps {
-                script {
-                    //Multiple Jenkins junit plugin calls due java.nio.channels.ClosedChannelException in new/cloud Eclipse.org build infrastructure if it's called once
-                    //Retry is there to try (in case of crash) junit test upload again.
-                    retryCount = 5
-                    junitReportFiles = [
-                            'bundles/**/target/surefire-reports/*.xml,bundles/**/target/failsafe-reports/*.xml',
-                            'dbws/**/target/surefire-reports/*.xml,dbws/**/target/failsafe-reports/*.xml',
-                            'foundation/**/target/surefire-reports/*.xml,foundation/**/target/failsafe-reports/*.xml',
-                            'jpa/**/target/surefire-reports/*.xml,jpa/**/target/failsafe-reports/*.xml',
-                            'moxy/**/target/surefire-reports/*.xml,moxy/**/target/failsafe-reports/*.xml',
-                            'sdo/**/target/surefire-reports/*.xml,sdo/**/target/failsafe-reports/*.xml',
-                            'utils/**/target/surefire-reports/*.xml,utils/**/target/failsafe-reports/*.xml'
-                    ]
-                    for (item in junitReportFiles) {
-                        echo 'Processing file: ' + item
-                        retry(retryCount) {
-                            junit allowEmptyResults: true, testResults: item
-                        }
+    }
+    post {
+        always{
+            script {
+                //Multiple Jenkins junit plugin calls due java.nio.channels.ClosedChannelException in new/cloud Eclipse.org build infrastructure if it's called once
+                //Retry is there to try (in case of crash) junit test upload again.
+                retryCount = 5
+                junitReportFiles = [
+                        'bundles/**/target/surefire-reports/*.xml,bundles/**/target/failsafe-reports/*.xml',
+                        'dbws/**/target/surefire-reports/*.xml,dbws/**/target/failsafe-reports/*.xml',
+                        'foundation/**/target/surefire-reports/*.xml,foundation/**/target/failsafe-reports/*.xml',
+                        'jpa/**/target/surefire-reports/*.xml,jpa/**/target/failsafe-reports/*.xml',
+                        'moxy/**/target/surefire-reports/*.xml,moxy/**/target/failsafe-reports/*.xml',
+                        'sdo/**/target/surefire-reports/*.xml,sdo/**/target/failsafe-reports/*.xml',
+                        'utils/**/target/surefire-reports/*.xml,utils/**/target/failsafe-reports/*.xml'
+                ]
+                for (item in junitReportFiles) {
+                    echo 'Processing file: ' + item
+                    retry(retryCount) {
+                        junit allowEmptyResults: true, testResults: item
                     }
                 }
             }
+            recordIssues(tools: [spotBugs(useRankAsPriority: true), java(), javaDoc()])
         }
-    }
-    post {
         // Send a mail on unsuccessful and fixed builds
         unsuccessful { // means unstable || failure || aborted
             emailext subject: 'Build $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER failed!',

diff --git a/etc/jenkins/pr_verify.groovy b/etc/jenkins/pr_verify.groovy
@@ -92,7 +92,7 @@ spec:
     }
     tools {
         maven 'apache-maven-latest'
-        jdk 'adoptopenjdk-hotspot-latest'
+        jdk 'openjdk-jdk17-latest'
     }
     stages {
         // Initialize build environment
@@ -246,6 +246,7 @@ spec:
                     }
                 }
             }
+            recordIssues(tools: [spotBugs(useRankAsPriority: true), java(), javaDoc()])
         }
     }
 }
diff --git a/etc/jenkins/release.groovy b/etc/jenkins/release.groovy
@@ -57,18 +57,18 @@ spec:
   - name: jnlp
     resources:
       limits:
-        memory: "1Gi"
+        memory: "2Gi"
         cpu: "1"
       requests:
-        memory: "1Gi"
+        memory: "2Gi"
         cpu: "500m"
   - name: el-build
     resources:
       limits:
-        memory: "2Gi"
+        memory: "4Gi"
         cpu: "2"
       requests:
-        memory: "2Gi"
+        memory: "4Gi"
         cpu: "1.5"
     image: tkraus/el-build:1.1.9
     volumeMounts:

diff --git a/etc/jenkins/release.sh b/etc/jenkins/release.sh
@@ -20,7 +20,6 @@ HELP_PLUGIN='org.apache.maven.plugins:maven-help-plugin:3.1.0'
 # $5 -  OVERWRITE_STAGING           - Allows to overwrite existing version in OSSRH (Jakarta) staging repositories
 
 echo '-[ EclipseLink Release ]-----------------------------------------------------------'
-. /etc/profile
 
 ECLIPSELINK_VERSION="${1}"
 NEXT_ECLIPSELINK_VERSION="${2}"
@@ -97,7 +96,7 @@ fi
 
 echo '-[ Build project mvn clean install ]-----------------------------'
 #This step is needed to populate local Maven repository with required but not deployed artifacts
-mvn --no-transfer-progress -DskipTests clean install
+mvn --no-transfer-progress -V -DskipTests clean install
 #Deploy selected artifacts. There is Maven property -Ddeploy to control which modules will be deployed
 echo '-[ Deploy artifacts to staging repository ]-----------------------------'
 # Verify, sign and deploy release