From edcb42dcf31dfb24c643d23dc61ef39da0dc7548 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Tue, 24 Jun 2025 16:17:49 -0700 Subject: [PATCH 1/2] Refactor maven downloading logic to be dynamic Signed-off-by: Sayali Gaikawad --- jenkins/release.jenkinsFile | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/jenkins/release.jenkinsFile b/jenkins/release.jenkinsFile index 083d9d56b0..54594b1938 100644 --- a/jenkins/release.jenkinsFile +++ b/jenkins/release.jenkinsFile @@ -235,13 +235,16 @@ pipeline { stage('Download Maven Artifacts') { steps { script { - mavenPath = "${DATA_PREPPER_ARTIFACT_STAGING_SITE}/${VERSION}/${DATA_PREPPER_BUILD_NUMBER}/maven" - group = 'org/opensearch/dataprepper' - artifacts = ['data-prepper-api'] - fileTypes = ['-javadoc.jar', '.jar', '.pom', '-sources.jar', '.module'] - checksums = ['', '.md5', '.sha1', '.sha256', '.sha512'] - - downloadArtifacts("$VERSION") + downloadPath = "${VERSION}/${DATA_PREPPER_BUILD_NUMBER}/maven" + withCredentials([ + string(credentialsId: 'data-prepper-s3-role', variable: 'DP_S3_ROLE_NAME'), + string(credentialsId: 'data-prepper-aws-account-number', variable: 'DP_AWS_ACCOUNT_NUMBER'), + string(credentialsId: 'data-prepper-s3-bucket-name', variable: 'DP_S3_BUCKET_NAME'),]) { + echo 'Downloading artifacts from S3...' + withAWS(role: "${DP_S3_ROLE_NAME}", roleAccount: "${DP_AWS_ACCOUNT_NUMBER}", duration: 900, roleSessionName: 'dp-jenkins-session', region: "${region}") { + s3Download(file: "${WORKSPACE}/maven", bucket: "${DP_S3_BUCKET_NAME}", path: "${downloadPath}", force: true) + } + } } } } @@ -281,19 +284,6 @@ pipeline { } } -def downloadArtifacts(version) { - dir('maven') { - for (artifact in artifacts) { - sh "mkdir -p ${group}/${artifact}/${version}" - for (fileType in fileTypes) { - for (checksum in checksums) { - sh "curl -sSL ${mavenPath}/${group}/${artifact}/${version}/${artifact}-${version}${fileType}${checksum} -o ${group}/${artifact}/${version}/${artifact}-${version}${fileType}${checksum}" - } - } - } - } -} - def isNullOrEmpty(str) { return (str == null || str == '') } From 99f20f15670421b5bed17d4e09eb5c9279aeaa23 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Wed, 25 Jun 2025 12:13:25 -0700 Subject: [PATCH 2/2] Add region Signed-off-by: Sayali Gaikawad --- jenkins/release.jenkinsFile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/release.jenkinsFile b/jenkins/release.jenkinsFile index 54594b1938..5cbd8b1ebd 100644 --- a/jenkins/release.jenkinsFile +++ b/jenkins/release.jenkinsFile @@ -240,8 +240,8 @@ pipeline { string(credentialsId: 'data-prepper-s3-role', variable: 'DP_S3_ROLE_NAME'), string(credentialsId: 'data-prepper-aws-account-number', variable: 'DP_AWS_ACCOUNT_NUMBER'), string(credentialsId: 'data-prepper-s3-bucket-name', variable: 'DP_S3_BUCKET_NAME'),]) { - echo 'Downloading artifacts from S3...' - withAWS(role: "${DP_S3_ROLE_NAME}", roleAccount: "${DP_AWS_ACCOUNT_NUMBER}", duration: 900, roleSessionName: 'dp-jenkins-session', region: "${region}") { + echo 'Downloading artifacts from S3' + withAWS(role: "${DP_S3_ROLE_NAME}", roleAccount: "${DP_AWS_ACCOUNT_NUMBER}", duration: 900, roleSessionName: 'dp-jenkins-session', region: 'us-east-1') { s3Download(file: "${WORKSPACE}/maven", bucket: "${DP_S3_BUCKET_NAME}", path: "${downloadPath}", force: true) } }