From 1f02c4eb297767889384a325cb700a828ffc7c9e Mon Sep 17 00:00:00 2001 From: Zelin Hao Date: Mon, 11 Apr 2022 13:04:37 -0700 Subject: [PATCH 1/2] Fix the path for staging maven Signed-off-by: Zelin Hao --- jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile index e7e0e84077..0f85a12244 100644 --- a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile +++ b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile @@ -56,7 +56,7 @@ pipeline { script { // stage artifacts for release with Sonatype withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { - sh('$WORKSPACE/publish/stage-maven-release.sh $WORKSPACE/artifacts/$ARTIFACT_PATH/maven-signed') + sh('$WORKSPACE/publish/stage-maven-release.sh $WORKSPACE/artifacts/$ARTIFACT_PATH/opensearch/maven') } } } From eb2771b50ff76c0f39a5d983eea7d27715d74bd8 Mon Sep 17 00:00:00 2001 From: Zelin Hao Date: Mon, 11 Apr 2022 15:16:14 -0700 Subject: [PATCH 2/2] Add the distribution folder tar to the artifact path and update test Signed-off-by: Zelin Hao --- jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile | 2 +- .../maven-sign-release/maven-sign-release.jenkinsfile.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile index 0f85a12244..cc189e65ca 100644 --- a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile +++ b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile @@ -21,7 +21,7 @@ pipeline { ) } environment { - ARTIFACT_PATH = "distribution-build-opensearch/${VERSION}/${BUILD_ID}/linux/x64/builds" + ARTIFACT_PATH = "distribution-build-opensearch/${VERSION}/${BUILD_ID}/linux/x64/tar/builds" } stages { stage('sign') { diff --git a/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt index 52ebddcbba..21ff0fa634 100644 --- a/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt @@ -30,7 +30,7 @@ maven-sign-release.script(groovy.lang.Closure) maven-sign-release.usernamePassword({credentialsId=Sonatype, usernameVariable=SONATYPE_USERNAME, passwordVariable=SONATYPE_PASSWORD}) maven-sign-release.withCredentials([[SONATYPE_USERNAME, SONATYPE_PASSWORD]], groovy.lang.Closure) - maven-sign-release.sh($WORKSPACE/publish/stage-maven-release.sh $WORKSPACE/artifacts/$ARTIFACT_PATH/maven-signed) + maven-sign-release.sh($WORKSPACE/publish/stage-maven-release.sh $WORKSPACE/artifacts/$ARTIFACT_PATH/opensearch/maven) maven-sign-release.script(groovy.lang.Closure) maven-sign-release.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})