From 056b6a270e97b48541caced7302a9aef057aed54 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Mon, 6 Jan 2025 14:23:07 +0000 Subject: [PATCH 1/2] Run the GPG sign job after the SBOM sign --- pipelines/build/common/openjdk_build_pipeline.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index 76caede27..af31fcc6e 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -2484,8 +2484,9 @@ def buildScriptsAssemble( if (!env.JOB_NAME.contains('pr-tester') && context.JENKINS_URL.contains('adopt')) { try { context.println "openjdk_build_pipeline: Running GPG signing process" - gpgSign() jsfSignSBOM() + gpgSign() + } catch (Exception e) { context.println(e.message) currentBuild.result = 'FAILURE' From 5a3d45459dbddcaba7c82dd4e66ea92858d5b36f Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Mon, 6 Jan 2025 16:14:04 +0000 Subject: [PATCH 2/2] Edit stage label --- pipelines/build/common/openjdk_build_pipeline.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index af31fcc6e..5c9ccea53 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -1064,7 +1064,7 @@ class Build { // Kick off the sign_temurin_jsf job to sign the SBOM private void jsfSignSBOM() { - context.stage('SBOM Sign') { + context.stage('SBOM JSF Sign') { context.println "Running build_sign_sbom_libraries to build the SBOM libraries" def buildSBOMLibrariesJob = context.build job: 'build_sign_sbom_libraries', @@ -2486,7 +2486,7 @@ def buildScriptsAssemble( context.println "openjdk_build_pipeline: Running GPG signing process" jsfSignSBOM() gpgSign() - + } catch (Exception e) { context.println(e.message) currentBuild.result = 'FAILURE'