From f0df0314d7e232f31187b35eee6bd17a0b9b0be7 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 19 Nov 2024 12:01:16 +0000 Subject: [PATCH 01/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 279971091..687711c1c 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -776,11 +776,16 @@ class Builder implements Serializable { /* Call job to push artifacts to github. Usually it's only executed on a nightly build */ - def publishBinary(IndividualBuildConfig config=null) { + def publishBinary(IndividualBuildConfig config=null, String jobResult) { def timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC')) def javaVersion=determineReleaseToolRepoVersion() def stageName = 'BETA publish' def releaseComment = 'BETA publish' + def extendedLinkComment = '' + if ( jobResult != "SUCCESS" && jobResult != "UNSTABLE" ) { + extendedLinkComment = '

WARNING: job result(' + jobResult + ')

: ' + } + def tag = "${javaToBuild}-${timestamp}" if (publishName) { tag = publishName @@ -821,6 +826,10 @@ class Builder implements Serializable { } } } + + // Prefix with any extended comment + releaseComment = extendedLinkComment + releaseComment + releaseToolUrl += "VERSION=${javaVersion}&RELEASE=${release}&UPSTREAM_JOB_NUMBER=${currentBuild.getNumber()}" tag = URLEncoder.encode(tag, 'UTF-8') artifactsToCopy = URLEncoder.encode(artifactsToCopy, 'UTF-8') @@ -975,7 +984,7 @@ class Builder implements Serializable { copyArtifactSuccess = true if (release) { - def (String releaseToolUrl, String releaseComment) = publishBinary(config) + def (String releaseToolUrl, String releaseComment) = publishBinary(config, downstreamJob.getResult()) releaseSummary.appendText("
  • ${releaseComment} ${config.VARIANT} ${publishName} ${config.TARGET_OS} ${config.ARCHITECTURE}
    • ") } } @@ -1052,7 +1061,7 @@ class Builder implements Serializable { } else { try { context.timeout(time: pipelineTimeouts.PUBLISH_ARTIFACTS_TIMEOUT, unit: 'HOURS') { - def (String releaseToolUrl, String releaseComment) = publishBinary() + def (String releaseToolUrl, String releaseComment) = publishBinary(null, currentBuild.result) releaseSummary.appendText("
  • ${releaseComment} Rerun Link
    • ") } } catch (FlowInterruptedException e) { From 9c14675f3f46fb090f0573e6d15f6cdb13deec50 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 19 Nov 2024 15:47:48 +0000 Subject: [PATCH 02/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 687711c1c..885d5dc7b 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -1023,14 +1023,19 @@ class Builder implements Serializable { flatten: true, optional: true ) - // Archive tap files as a single tar file + // Archive tap files as a single tar file if we have any context.sh """ cd ${tarDir}/ - tar -czf ${tarTap} *.tap + if [[ $(ls -l *.tap) ]]; then + tar -czf ${tarTap} *.tap + fi """ try { - context.timeout(time: pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT, unit: 'HOURS') { - context.archiveArtifacts artifacts: "${tarDir}/${tarTap}" + def tarTapExists = context.sh(script: "ls -l ${tarDir}/${tarTap}", returnStatus:true) + if (tarTapExists == 0) { + context.timeout(time: pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT, unit: 'HOURS') { + context.archiveArtifacts artifacts: "${tarDir}/${tarTap}" + } } } catch (FlowInterruptedException e) { throw new Exception("[ERROR] Archive AQAvitTapFiles.tar.gz timeout Exiting...") From f6ec03f6026e63473bdb7e9bdd357bf2ed7faf33 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 19 Nov 2024 15:59:50 +0000 Subject: [PATCH 03/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 885d5dc7b..7d58f550f 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -1026,7 +1026,7 @@ class Builder implements Serializable { // Archive tap files as a single tar file if we have any context.sh """ cd ${tarDir}/ - if [[ $(ls -l *.tap) ]]; then + if [[ `ls -l *.tap` ]]; then tar -czf ${tarTap} *.tap fi """ From 95eb4ebcf2d95aa04bbb76587739299cb1bb8c8f Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 20 Nov 2024 14:33:32 +0000 Subject: [PATCH 04/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 7d58f550f..ba3fdd40c 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -781,9 +781,11 @@ class Builder implements Serializable { def javaVersion=determineReleaseToolRepoVersion() def stageName = 'BETA publish' def releaseComment = 'BETA publish' - def extendedLinkComment = '' + def extendedLinkCommentPre = '' + def extendedLinkCommentPost = '' if ( jobResult != "SUCCESS" && jobResult != "UNSTABLE" ) { - extendedLinkComment = '

    WARNING: job result(' + jobResult + ')

    : ' + extendedLinkCommentPre = '

    WARNING: job result(' + jobResult + ') : ' + extendedLinkCommentPost = '

    ' } def tag = "${javaToBuild}-${timestamp}" @@ -827,8 +829,8 @@ class Builder implements Serializable { } } - // Prefix with any extended comment - releaseComment = extendedLinkComment + releaseComment + // Prefix/Postfix with any extended comment + releaseComment = extendedLinkCommentPre + releaseComment + extendedLinkCommentPost releaseToolUrl += "VERSION=${javaVersion}&RELEASE=${release}&UPSTREAM_JOB_NUMBER=${currentBuild.getNumber()}" tag = URLEncoder.encode(tag, 'UTF-8') From 5bef44133ca047a4bee8704e8db23707389f0319 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 20 Nov 2024 15:40:43 +0000 Subject: [PATCH 05/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index ba3fdd40c..e73967218 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -781,11 +781,9 @@ class Builder implements Serializable { def javaVersion=determineReleaseToolRepoVersion() def stageName = 'BETA publish' def releaseComment = 'BETA publish' - def extendedLinkCommentPre = '' - def extendedLinkCommentPost = '' + def prefixLinkComment = '' if ( jobResult != "SUCCESS" && jobResult != "UNSTABLE" ) { - extendedLinkCommentPre = '

    WARNING: job result(' + jobResult + ') : ' - extendedLinkCommentPost = '

    ' + prefixLinkComment = 'WARNING: job result(' + jobResult + ') : ' } def tag = "${javaToBuild}-${timestamp}" @@ -829,8 +827,8 @@ class Builder implements Serializable { } } - // Prefix/Postfix with any extended comment - releaseComment = extendedLinkCommentPre + releaseComment + extendedLinkCommentPost + // Add any prefix comment + releaseComment = prefixLinkComment + releaseComment releaseToolUrl += "VERSION=${javaVersion}&RELEASE=${release}&UPSTREAM_JOB_NUMBER=${currentBuild.getNumber()}" tag = URLEncoder.encode(tag, 'UTF-8') From 2f9d72fb55761fe42b9e58b34e588168cdde3269 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 20 Nov 2024 15:47:41 +0000 Subject: [PATCH 06/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/jobs/configurations/jdk11u_pipeline_config.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index 8e16dc941..5e415cb78 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -193,14 +193,14 @@ class Config11 { dragonwell: 'armv8.2' ], configureArgs : [ - 'temurin' : '--enable-dtrace=auto --disable-ccache --with-jobs=4', + 'temurin' : '--enable-dtrace=auto --disable-ccache', 'openj9' : '--enable-dtrace=auto', 'corretto' : '--enable-dtrace=auto', 'dragonwell': "--enable-dtrace=auto --with-extra-cflags=\"-march=armv8.2-a+crypto\" --with-extra-cxxflags=\"-march=armv8.2-a+crypto\"", 'bisheng' : '--enable-dtrace=auto --with-extra-cflags=-fstack-protector-strong --with-extra-cxxflags=-fstack-protector-strong --with-jvm-variants=server' ], buildArgs : [ - 'temurin' : '--create-sbom --enable-sbom-strace' + 'temurin' : '--create-sbom' ] ], From f7f1092f87517ab827e589a02307b38248f61663 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 20 Nov 2024 16:28:36 +0000 Subject: [PATCH 07/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/jobs/configurations/jdk11u_pipeline_config.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index 5e415cb78..2c56bec42 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -49,7 +49,7 @@ class Config11 { 'temurin' : '--enable-headless-only=yes --disable-ccache' ], buildArgs : [ - 'temurin' : '--create-sbom --enable-sbom-strace' + 'temurin' : '--create-sbom' ] ], From 7ceec73c29d31051fddb7444c5dcfa442550e8bc Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 20 Nov 2024 16:38:26 +0000 Subject: [PATCH 08/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index e73967218..7ee1c3a22 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -783,7 +783,7 @@ class Builder implements Serializable { def releaseComment = 'BETA publish' def prefixLinkComment = '' if ( jobResult != "SUCCESS" && jobResult != "UNSTABLE" ) { - prefixLinkComment = 'WARNING: job result(' + jobResult + ') : ' + prefixLinkComment = 'WARNING: build result(' + jobResult + ') : ' } def tag = "${javaToBuild}-${timestamp}" From 2918489d01fc44779afc84d63430b0ad3bfc5ef5 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 21 Nov 2024 08:50:46 +0000 Subject: [PATCH 09/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/jobs/configurations/jdk11u_pipeline_config.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index 2c56bec42..8e16dc941 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -49,7 +49,7 @@ class Config11 { 'temurin' : '--enable-headless-only=yes --disable-ccache' ], buildArgs : [ - 'temurin' : '--create-sbom' + 'temurin' : '--create-sbom --enable-sbom-strace' ] ], @@ -193,14 +193,14 @@ class Config11 { dragonwell: 'armv8.2' ], configureArgs : [ - 'temurin' : '--enable-dtrace=auto --disable-ccache', + 'temurin' : '--enable-dtrace=auto --disable-ccache --with-jobs=4', 'openj9' : '--enable-dtrace=auto', 'corretto' : '--enable-dtrace=auto', 'dragonwell': "--enable-dtrace=auto --with-extra-cflags=\"-march=armv8.2-a+crypto\" --with-extra-cxxflags=\"-march=armv8.2-a+crypto\"", 'bisheng' : '--enable-dtrace=auto --with-extra-cflags=-fstack-protector-strong --with-extra-cxxflags=-fstack-protector-strong --with-jvm-variants=server' ], buildArgs : [ - 'temurin' : '--create-sbom' + 'temurin' : '--create-sbom --enable-sbom-strace' ] ], From 164afc202be2c3778a96946e041ed020d0db7897 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 21 Nov 2024 10:18:00 +0000 Subject: [PATCH 10/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 7ee1c3a22..b28060f5e 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -776,14 +776,16 @@ class Builder implements Serializable { /* Call job to push artifacts to github. Usually it's only executed on a nightly build */ - def publishBinary(IndividualBuildConfig config=null, String jobResult) { + def publishBinary(IndividualBuildConfig config=null, String jobResult, String jobUrl) { def timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC')) def javaVersion=determineReleaseToolRepoVersion() def stageName = 'BETA publish' def releaseComment = 'BETA publish' def prefixLinkComment = '' if ( jobResult != "SUCCESS" && jobResult != "UNSTABLE" ) { - prefixLinkComment = 'WARNING: build result(' + jobResult + ') : ' + // Build was not successful, add warning and link to build job + def buildUrl = "${context.JENKINS_URL}${jobUrl}" + prefixLinkComment = 'WARNING: build result(' + jobResult + ') : ' } def tag = "${javaToBuild}-${timestamp}" @@ -984,7 +986,7 @@ class Builder implements Serializable { copyArtifactSuccess = true if (release) { - def (String releaseToolUrl, String releaseComment) = publishBinary(config, downstreamJob.getResult()) + def (String releaseToolUrl, String releaseComment) = publishBinary(config, downstreamJob.getResult(), downstreamJob.getUrl()) releaseSummary.appendText("
  • ${releaseComment} ${config.VARIANT} ${publishName} ${config.TARGET_OS} ${config.ARCHITECTURE}
    • ") } } @@ -1066,7 +1068,7 @@ class Builder implements Serializable { } else { try { context.timeout(time: pipelineTimeouts.PUBLISH_ARTIFACTS_TIMEOUT, unit: 'HOURS') { - def (String releaseToolUrl, String releaseComment) = publishBinary(null, currentBuild.result) + def (String releaseToolUrl, String releaseComment) = publishBinary(null, currentBuild.result, "${context.JOB_URL}") releaseSummary.appendText("
  • ${releaseComment} Rerun Link
    • ") } } catch (FlowInterruptedException e) { From 54f0fe1300c49dcfb787b962e43af577c5ec9b07 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 21 Nov 2024 11:25:24 +0000 Subject: [PATCH 11/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index b28060f5e..7bd8adfec 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -986,7 +986,7 @@ class Builder implements Serializable { copyArtifactSuccess = true if (release) { - def (String releaseToolUrl, String releaseComment) = publishBinary(config, downstreamJob.getResult(), downstreamJob.getUrl()) + def (String releaseToolUrl, String releaseComment) = publishBinary(config, downstreamJob.getResult(), downstreamJob.getAbsoluteUrl()) releaseSummary.appendText("
  • ${releaseComment} ${config.VARIANT} ${publishName} ${config.TARGET_OS} ${config.ARCHITECTURE}
    • ") } } From 2ba8f150e73b09b7fd12ea42dfe779797693e830 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 21 Nov 2024 12:45:13 +0000 Subject: [PATCH 12/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 7bd8adfec..e51aa31fe 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -781,11 +781,11 @@ class Builder implements Serializable { def javaVersion=determineReleaseToolRepoVersion() def stageName = 'BETA publish' def releaseComment = 'BETA publish' - def prefixLinkComment = '' + def releaseWarning = '' if ( jobResult != "SUCCESS" && jobResult != "UNSTABLE" ) { // Build was not successful, add warning and link to build job def buildUrl = "${context.JENKINS_URL}${jobUrl}" - prefixLinkComment = 'WARNING: build result(' + jobResult + ') : ' + releaseWarning = 'WARNING: build result(' + jobResult + ') : ' } def tag = "${javaToBuild}-${timestamp}" @@ -829,9 +829,6 @@ class Builder implements Serializable { } } - // Add any prefix comment - releaseComment = prefixLinkComment + releaseComment - releaseToolUrl += "VERSION=${javaVersion}&RELEASE=${release}&UPSTREAM_JOB_NUMBER=${currentBuild.getNumber()}" tag = URLEncoder.encode(tag, 'UTF-8') artifactsToCopy = URLEncoder.encode(artifactsToCopy, 'UTF-8') @@ -839,7 +836,7 @@ class Builder implements Serializable { releaseToolUrl += "&TAG=${tag}&UPSTREAM_JOB_NAME=${urlJobName}&ARTIFACTS_TO_COPY=${artifactsToCopy}" context.echo "return releaseToolUrl is ${releaseToolUrl}" - return ["${releaseToolUrl}", "${releaseComment}"] + return ["${releaseToolUrl}", "${releaseComment}", "${releaseWarning}"] } /* @@ -986,8 +983,8 @@ class Builder implements Serializable { copyArtifactSuccess = true if (release) { - def (String releaseToolUrl, String releaseComment) = publishBinary(config, downstreamJob.getResult(), downstreamJob.getAbsoluteUrl()) - releaseSummary.appendText("
  • ${releaseComment} ${config.VARIANT} ${publishName} ${config.TARGET_OS} ${config.ARCHITECTURE}
    • ") + def (String releaseToolUrl, String releaseComment, String releaseWarning) = publishBinary(config, downstreamJob.getResult(), downstreamJob.getAbsoluteUrl()) + releaseSummary.appendText("
  • ${releaseWarning} ${releaseComment} ${config.VARIANT} ${publishName} ${config.TARGET_OS} ${config.ARCHITECTURE}
    • ") } } } @@ -1068,8 +1065,8 @@ class Builder implements Serializable { } else { try { context.timeout(time: pipelineTimeouts.PUBLISH_ARTIFACTS_TIMEOUT, unit: 'HOURS') { - def (String releaseToolUrl, String releaseComment) = publishBinary(null, currentBuild.result, "${context.JOB_URL}") - releaseSummary.appendText("
  • ${releaseComment} Rerun Link
    • ") + def (String releaseToolUrl, String releaseComment, String releaseWarning) = publishBinary(null, currentBuild.result, "${context.JOB_URL}") + releaseSummary.appendText("
  • ${releaseWarning} ${releaseComment} Rerun Link
    • ") } } catch (FlowInterruptedException e) { throw new Exception("[ERROR] Publish binary timeout (${pipelineTimeouts.PUBLISH_ARTIFACTS_TIMEOUT} HOURS) has been reached OR the downstream publish job failed. Exiting...") From 4f28e6819358ca831c778a2221c0e6e5b0058fe4 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 21 Nov 2024 13:52:48 +0000 Subject: [PATCH 13/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index e51aa31fe..6bacf10be 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -784,8 +784,7 @@ class Builder implements Serializable { def releaseWarning = '' if ( jobResult != "SUCCESS" && jobResult != "UNSTABLE" ) { // Build was not successful, add warning and link to build job - def buildUrl = "${context.JENKINS_URL}${jobUrl}" - releaseWarning = 'WARNING: build result(' + jobResult + ') : ' + releaseWarning = 'WARNING: build result(' + jobResult + ') : ' } def tag = "${javaToBuild}-${timestamp}" From 48890c98eaf032a83666d88b9f07c065cffe3ed1 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 21 Nov 2024 14:44:14 +0000 Subject: [PATCH 14/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 6bacf10be..fd5c944ef 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -827,7 +827,6 @@ class Builder implements Serializable { } } } - releaseToolUrl += "VERSION=${javaVersion}&RELEASE=${release}&UPSTREAM_JOB_NUMBER=${currentBuild.getNumber()}" tag = URLEncoder.encode(tag, 'UTF-8') artifactsToCopy = URLEncoder.encode(artifactsToCopy, 'UTF-8') From 127e919a70382d0da659bd52d3133ed959fa9c57 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 21 Nov 2024 15:09:53 +0000 Subject: [PATCH 15/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index fd5c944ef..4a7e20897 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -1063,7 +1063,7 @@ class Builder implements Serializable { } else { try { context.timeout(time: pipelineTimeouts.PUBLISH_ARTIFACTS_TIMEOUT, unit: 'HOURS') { - def (String releaseToolUrl, String releaseComment, String releaseWarning) = publishBinary(null, currentBuild.result, "${context.JOB_URL}") + def (String releaseToolUrl, String releaseComment, String releaseWarning) = publishBinary(null, currentBuild.result, "${context.BUILD_URL}") releaseSummary.appendText("
  • ${releaseWarning} ${releaseComment} Rerun Link
    • ") } } catch (FlowInterruptedException e) { From 353efecca1897ae42c3c85f9fdf771f666f69d31 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 22 Nov 2024 13:00:40 +0000 Subject: [PATCH 16/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 4a7e20897..7fe8f90d1 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -1021,21 +1021,19 @@ class Builder implements Serializable { optional: true ) // Archive tap files as a single tar file if we have any - context.sh """ - cd ${tarDir}/ - if [[ `ls -l *.tap` ]]; then - tar -czf ${tarTap} *.tap - fi - """ - try { - def tarTapExists = context.sh(script: "ls -l ${tarDir}/${tarTap}", returnStatus:true) - if (tarTapExists == 0) { + def tapExists = context.sh(script: "ls -l ${tarDir}/*.tap", returnStatus:true) + if (tapExists == 0) { + context.sh """ + cd ${tarDir}/ + tar -czf ${tarTap} *.tap + """ + try { context.timeout(time: pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT, unit: 'HOURS') { context.archiveArtifacts artifacts: "${tarDir}/${tarTap}" } + } catch (FlowInterruptedException e) { + throw new Exception("[ERROR] Archive AQAvitTapFiles.tar.gz timeout Exiting...") } - } catch (FlowInterruptedException e) { - throw new Exception("[ERROR] Archive AQAvitTapFiles.tar.gz timeout Exiting...") } } } From 3436cce48a488261ab3b9f42f07a68f9ad79631c Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 25 Nov 2024 15:25:47 +0000 Subject: [PATCH 17/17] Add pipeline publish link warning if job fails Signed-off-by: Andrew Leonard --- pipelines/build/common/build_base_file.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 7fe8f90d1..c794a062a 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -784,7 +784,7 @@ class Builder implements Serializable { def releaseWarning = '' if ( jobResult != "SUCCESS" && jobResult != "UNSTABLE" ) { // Build was not successful, add warning and link to build job - releaseWarning = 'WARNING: build result(' + jobResult + ') : ' + releaseWarning = 'WARNING: pipeline status was ' + jobResult + ' : ' } def tag = "${javaToBuild}-${timestamp}"