From 2a1ab0d55099715b815241fcadc7148986455660 Mon Sep 17 00:00:00 2001 From: Tianle Huang Date: Fri, 22 Apr 2022 19:12:07 +0000 Subject: [PATCH 1/2] upload test result to upstream job if exits Signed-off-by: Tianle Huang --- jenkins/opensearch-dashboards/integ-test.jenkinsfile | 4 +++- jenkins/opensearch/integ-test.jenkinsfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index e248130028..20e3491f26 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -99,9 +99,11 @@ pipeline { post { always { script { + String jobNameToUploadResult = currentBuild.upstreamBuilds ? currentBuild.upstreamBuilds[0].fullProjectName : JOB_NAME + uploadTestResults( buildManifestFileName: BUILD_MANIFEST, - jobName: JOB_NAME, + jobName: jobNameToUploadResult, buildNumber: BUILD_ID ) } diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index b54648f43e..aa31c15972 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -102,9 +102,11 @@ pipeline { post { always { script { + String jobNameToUploadResult = currentBuild.upstreamBuilds ? currentBuild.upstreamBuilds[0].fullProjectName : JOB_NAME + uploadTestResults( buildManifestFileName: BUILD_MANIFEST, - jobName: JOB_NAME, + jobName: jobNameToUploadResult, buildNumber: BUILD_ID ) } From 0e4dbd51dd1a1ab1a0be778f5b9c53500705a9fa Mon Sep 17 00:00:00 2001 From: Tianle Huang Date: Fri, 22 Apr 2022 19:26:08 +0000 Subject: [PATCH 2/2] update bwc as well Signed-off-by: Tianle Huang --- jenkins/opensearch-dashboards/bwc-test.jenkinsfile | 4 +++- jenkins/opensearch/bwc-test.jenkinsfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jenkins/opensearch-dashboards/bwc-test.jenkinsfile b/jenkins/opensearch-dashboards/bwc-test.jenkinsfile index dc407267c2..6a9516fd83 100644 --- a/jenkins/opensearch-dashboards/bwc-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/bwc-test.jenkinsfile @@ -99,9 +99,11 @@ pipeline { post { always { script { + String jobNameToUploadResult = currentBuild.upstreamBuilds ? currentBuild.upstreamBuilds[0].fullProjectName : JOB_NAME + uploadTestResults( buildManifestFileName: BUILD_MANIFEST, - jobName: JOB_NAME, + jobName: jobNameToUploadResult, buildNumber: BUILD_ID ) } diff --git a/jenkins/opensearch/bwc-test.jenkinsfile b/jenkins/opensearch/bwc-test.jenkinsfile index 4bd0d2c4bf..ded63da7bb 100644 --- a/jenkins/opensearch/bwc-test.jenkinsfile +++ b/jenkins/opensearch/bwc-test.jenkinsfile @@ -102,9 +102,11 @@ pipeline { post { always { script { + String jobNameToUploadResult = currentBuild.upstreamBuilds ? currentBuild.upstreamBuilds[0].fullProjectName : JOB_NAME + uploadTestResults( buildManifestFileName: BUILD_MANIFEST, - jobName: JOB_NAME, + jobName: jobNameToUploadResult, buildNumber: BUILD_ID ) }