Skip to content

Commit c3c602d

Browse files
Remove defaults value and correct release paths
Signed-off-by: Peter Zhu <[email protected]>
1 parent de209e4 commit c3c602d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

jenkins/promotion/tar-promotion.jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ pipeline {
1212
description: 'What platform is this distribution build for?.'
1313
)
1414
string(
15-
defaultValue: '98',
15+
defaultValue: '',
1616
name: 'DISTRIBUTION_BUILD_NUMBER',
1717
description: 'What is the build id of the above DISTRIBUTION_JOB_NAME that you want to promote? (e.g. 123, 136)',
1818
trim: true
1919
)
2020
string(
21-
defaultValue: '1.2.2/opensearch-1.2.2.yml',
21+
defaultValue: '',
2222
name: 'INPUT_MANIFEST',
2323
description: 'What is the input manifest of the above DISTRIBUTION_JOB_NAME that you want to promote? (e.g. 1.2.2/opensearch-1.2.2.yml)',
2424
trim: true

vars/promoteArtifacts.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void call(Map args = [:]) {
3333
String pluginNameWithExt = pluginSubPath.split('/')[1]
3434
String pluginName = pluginNameWithExt.replace('-' + version + '.zip', '')
3535
String pluginFullPath = ['plugins', pluginName, version].join('/')
36-
s3Upload(bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "builds/test-release-candidates/$pluginFullPath/", workingDir: "$WORKSPACE/artifacts/$artifactPath/builds/$filename/$pluginSubFolder/"
36+
s3Upload(bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "releases/$pluginFullPath/", workingDir: "$WORKSPACE/artifacts/$artifactPath/builds/$filename/$pluginSubFolder/"
3737
, includePathPattern: "**/${pluginName}*")
3838
}
3939

@@ -42,9 +42,9 @@ void call(Map args = [:]) {
4242
println("Start Tar Core/Bundle Promotion to artifacts.opensearch.org Bucket")
4343
String coreFullPath = ['core', filename, version].join('/')
4444
String bundleFullPath = ['bundle', filename, version].join('/')
45-
s3Upload(bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "builds/test-release-candidates/$coreFullPath/", workingDir: "$WORKSPACE/artifacts/$artifactPath/builds/$filename/dist/"
45+
s3Upload(bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "releases/$coreFullPath/", workingDir: "$WORKSPACE/artifacts/$artifactPath/builds/$filename/dist/"
4646
, includePathPattern: "**/${filename}-min-${version}*")
47-
s3Upload(bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "builds/test-release-candidates/$bundleFullPath/", workingDir: "$WORKSPACE/artifacts/$artifactPath/dist/$filename/"
47+
s3Upload(bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "releases/$bundleFullPath/", workingDir: "$WORKSPACE/artifacts/$artifactPath/dist/$filename/"
4848
, includePathPattern: "**/${filename}*-${version}*")
4949

5050

0 commit comments

Comments
 (0)