From 19eca43d6634b6851f66aa730f7e68d5621e247b Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 31 Oct 2024 13:52:43 -0400 Subject: [PATCH] more test Signed-off-by: Peter Zhu --- vars/uploadMinSnapshotsToS3.groovy | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vars/uploadMinSnapshotsToS3.groovy b/vars/uploadMinSnapshotsToS3.groovy index 793de1b5..4d14b56e 100644 --- a/vars/uploadMinSnapshotsToS3.groovy +++ b/vars/uploadMinSnapshotsToS3.groovy @@ -19,6 +19,10 @@ void call(Map args = [:]) { def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: manifest)) String productName = inputManifest.build.getFilename() + String version_plain = inputManifest.build.version + String qualifier = inputManifest.build.qualifier ? '-' + inputManifest.build.qualifier : '' + String revision = version_plain + qualifier + def buildManifestYamlOnly = readYaml(file: "$WORKSPACE/${distribution_arg}/builds/${productName}/manifest.yml") echo("Retreving build manifest from: $WORKSPACE/${distribution_arg}/builds/${productName}/manifest.yml") def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: "$WORKSPACE/${distribution_arg}/builds/${productName}/manifest.yml")) @@ -87,13 +91,13 @@ void call(Map args = [:]) { // core plugins if (architecture == "x64" && platform == "linux" && distribution == "tar" && corePluginDirExists) { echo("Upload core plugins") - List corePluginList = buildManifest.components.artifacts.'core-plugins' + List corePluginList = buildManifestYamlOnly.components.artifacts.'core-plugins'[0] echo("corePluginList: ${corePluginList}") for (String pluginSubPath : corePluginList) { String pluginSubFolder = pluginSubPath.split('/')[0] String pluginNameWithExt = pluginSubPath.split('/')[1] - String pluginName = pluginNameWithExt.replace('-' + version + 'SNAPSHOT' + '.zip', '') - String pluginFullPath = ['plugins', pluginName, version + 'SNAPSHOT'].join('/') + String pluginName = pluginNameWithExt.replace('-' + revision + 'SNAPSHOT' + '.zip', '') + String pluginFullPath = ['plugins', pluginName, revision + 'SNAPSHOT'].join('/') echo("pluginFullPath: ${pluginFullPath}") //s3Upload( // bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}",