From 45d6a9e66edf74a18efe165708fd324816db16de Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 30 Oct 2024 17:54:59 -0400 Subject: [PATCH 1/3] Upload core plugins snapshots in lib 7.3.2 Signed-off-by: Peter Zhu --- .../publish-min-snapshots.jenkinsfile | 2 +- tests/jenkins/TestPublishMinSnapshots.groovy | 2 +- .../publish-min-snapshots.jenkinsfile.txt | 49 ++++++++++++------- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/jenkins/opensearch/publish-min-snapshots.jenkinsfile b/jenkins/opensearch/publish-min-snapshots.jenkinsfile index fafa9cd609..2a706be555 100644 --- a/jenkins/opensearch/publish-min-snapshots.jenkinsfile +++ b/jenkins/opensearch/publish-min-snapshots.jenkinsfile @@ -7,7 +7,7 @@ * compatible open source license. */ -lib = library(identifier: 'jenkins@6.6.1', retriever: modernSCM([ +lib = library(identifier: 'jenkins@7.3.2', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', ])) diff --git a/tests/jenkins/TestPublishMinSnapshots.groovy b/tests/jenkins/TestPublishMinSnapshots.groovy index c3095a9581..fe0d189cea 100644 --- a/tests/jenkins/TestPublishMinSnapshots.groovy +++ b/tests/jenkins/TestPublishMinSnapshots.groovy @@ -25,7 +25,7 @@ class TestPublishMinSnapshots extends BuildPipelineTest { helper.registerSharedLibrary( library().name('jenkins') - .defaultVersion('6.6.1') + .defaultVersion('7.3.2') .allowOverride(true) .implicit(true) .targetPath('vars') diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt index ff2887fcbe..38dfdfc8c9 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt @@ -1,6 +1,6 @@ publish-min-snapshots.run() publish-min-snapshots.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git}) - publish-min-snapshots.library({identifier=jenkins@6.6.1, retriever=null}) + publish-min-snapshots.library({identifier=jenkins@7.3.2, retriever=null}) publish-min-snapshots.pipeline(groovy.lang.Closure) publish-min-snapshots.timeout({time=1, unit=HOURS}) publish-min-snapshots.echo(Executing on agent [label:none]) @@ -9,7 +9,7 @@ publish-min-snapshots.script(groovy.lang.Closure) publish-min-snapshots.detectDockerAgent() detectDockerAgent.legacySCM(groovy.lang.Closure) - detectDockerAgent.library({identifier=jenkins@6.6.1, retriever=null}) + detectDockerAgent.library({identifier=jenkins@7.3.2, retriever=null}) detectDockerAgent.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-v1 (null)) @@ -19,7 +19,7 @@ publish-min-snapshots.script(groovy.lang.Closure) publish-min-snapshots.buildManifest({componentName=OpenSearch, inputManifest=manifests/3.0.0/opensearch-3.0.0.yml, platform=linux, architecture=x64, distribution=tar, snapshot=true}) buildManifest.legacySCM(groovy.lang.Closure) - buildManifest.library({identifier=jenkins@6.6.1, retriever=null}) + buildManifest.library({identifier=jenkins@7.3.2, retriever=null}) buildManifest.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() buildManifest.sh(./build.sh manifests/3.0.0/opensearch-3.0.0.yml -d tar --component OpenSearch -p linux -a x64 --snapshot) @@ -27,17 +27,19 @@ publish-min-snapshots.createSha512Checksums() publish-min-snapshots.uploadMinSnapshotsToS3({fileActions=[groovy.lang.Closure], distribution=tar}) uploadMinSnapshotsToS3.legacySCM(groovy.lang.Closure) - uploadMinSnapshotsToS3.library({identifier=jenkins@6.6.1, retriever=null}) + uploadMinSnapshotsToS3.library({identifier=jenkins@7.3.2, retriever=null}) uploadMinSnapshotsToS3.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() + uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/tar/builds/opensearch/manifest.yml}) uploadMinSnapshotsToS3.echo(Retreving build manifest from: /tmp/workspace/tar/builds/opensearch/manifest.yml) uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/tar/builds/opensearch/manifest.yml}) BuildManifest.asBoolean() + uploadMinSnapshotsToS3.fileExists(/tmp/workspace/tar/builds/opensearch/core-plugins) uploadMinSnapshotsToS3.echo(Create .sha512 for Min Snapshots Artifacts) createSha512Checksums.sh({script=find /tmp/workspace/tar/builds/opensearch/dist -type f, returnStdout=true}) createSha512Checksums.echo(Not generating sha for bbb in /tmp/workspace/tar/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) createSha512Checksums.echo(Not generating sha for ccc in /tmp/workspace/tar/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) - uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT architecture-x64 platform-linux buildid-c1c835af3b9646868a9ac3f1e20a51de distribution-tar extension-tar.gz) + uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT revision-3.0.0-SNAPSHOT-SNAPSHOT architecture-x64 platform-linux buildid-c1c835af3b9646868a9ac3f1e20a51de distribution-tar extension-tar.gz) uploadMinSnapshotsToS3.sh( cp -v /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64.tar.gz /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz cp -v /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64.tar.gz.sha512 /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.sha512 @@ -49,6 +51,7 @@ uploadMinSnapshotsToS3.string({credentialsId=jenkins-artifact-production-bucket-name, variable=ARTIFACT_PRODUCTION_BUCKET_NAME}) uploadMinSnapshotsToS3.withCredentials([ARTIFACT_PROMOTION_ROLE_NAME, AWS_ACCOUNT_ARTIFACT, ARTIFACT_PRODUCTION_BUCKET_NAME], groovy.lang.Closure) uploadMinSnapshotsToS3.withAWS({role=ARTIFACT_PROMOTION_ROLE_NAME, roleAccount=AWS_ACCOUNT_ARTIFACT, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure) + uploadMinSnapshotsToS3.echo(Upload min snapshots) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.sha512}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.build-manifest.yml}) @@ -59,7 +62,7 @@ publish-min-snapshots.script(groovy.lang.Closure) publish-min-snapshots.buildManifest({componentName=OpenSearch, inputManifest=manifests/3.0.0/opensearch-3.0.0.yml, platform=linux, architecture=arm64, distribution=tar, snapshot=true}) buildManifest.legacySCM(groovy.lang.Closure) - buildManifest.library({identifier=jenkins@6.6.1, retriever=null}) + buildManifest.library({identifier=jenkins@7.3.2, retriever=null}) buildManifest.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() buildManifest.sh(./build.sh manifests/3.0.0/opensearch-3.0.0.yml -d tar --component OpenSearch -p linux -a arm64 --snapshot) @@ -67,17 +70,19 @@ publish-min-snapshots.createSha512Checksums() publish-min-snapshots.uploadMinSnapshotsToS3({fileActions=[groovy.lang.Closure], distribution=tar}) uploadMinSnapshotsToS3.legacySCM(groovy.lang.Closure) - uploadMinSnapshotsToS3.library({identifier=jenkins@6.6.1, retriever=null}) + uploadMinSnapshotsToS3.library({identifier=jenkins@7.3.2, retriever=null}) uploadMinSnapshotsToS3.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() + uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/tar/builds/opensearch/manifest.yml}) uploadMinSnapshotsToS3.echo(Retreving build manifest from: /tmp/workspace/tar/builds/opensearch/manifest.yml) uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/tar/builds/opensearch/manifest.yml}) BuildManifest.asBoolean() + uploadMinSnapshotsToS3.fileExists(/tmp/workspace/tar/builds/opensearch/core-plugins) uploadMinSnapshotsToS3.echo(Create .sha512 for Min Snapshots Artifacts) createSha512Checksums.sh({script=find /tmp/workspace/tar/builds/opensearch/dist -type f, returnStdout=true}) createSha512Checksums.echo(Not generating sha for bbb in /tmp/workspace/tar/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) createSha512Checksums.echo(Not generating sha for ccc in /tmp/workspace/tar/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) - uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT architecture-arm64 platform-linux buildid-629 distribution-tar extension-tar.gz) + uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT revision-3.0.0-SNAPSHOT-SNAPSHOT architecture-arm64 platform-linux buildid-629 distribution-tar extension-tar.gz) uploadMinSnapshotsToS3.sh( cp -v /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64.tar.gz /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz cp -v /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64.tar.gz.sha512 /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz.sha512 @@ -89,6 +94,7 @@ uploadMinSnapshotsToS3.string({credentialsId=jenkins-artifact-production-bucket-name, variable=ARTIFACT_PRODUCTION_BUCKET_NAME}) uploadMinSnapshotsToS3.withCredentials([ARTIFACT_PROMOTION_ROLE_NAME, AWS_ACCOUNT_ARTIFACT, ARTIFACT_PRODUCTION_BUCKET_NAME], groovy.lang.Closure) uploadMinSnapshotsToS3.withAWS({role=ARTIFACT_PROMOTION_ROLE_NAME, roleAccount=AWS_ACCOUNT_ARTIFACT, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure) + uploadMinSnapshotsToS3.echo(Upload min snapshots) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz.sha512}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz.build-manifest.yml}) @@ -102,7 +108,7 @@ publish-min-snapshots.sh(java -version) publish-min-snapshots.buildManifest({componentName=OpenSearch, inputManifest=manifests/3.0.0/opensearch-3.0.0.yml, platform=darwin, architecture=x64, distribution=tar, snapshot=true}) buildManifest.legacySCM(groovy.lang.Closure) - buildManifest.library({identifier=jenkins@6.6.1, retriever=null}) + buildManifest.library({identifier=jenkins@7.3.2, retriever=null}) buildManifest.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() buildManifest.sh(./build.sh manifests/3.0.0/opensearch-3.0.0.yml -d tar --component OpenSearch -p darwin -a x64 --snapshot) @@ -110,17 +116,19 @@ publish-min-snapshots.createSha512Checksums() publish-min-snapshots.uploadMinSnapshotsToS3({fileActions=[groovy.lang.Closure], distribution=tar}) uploadMinSnapshotsToS3.legacySCM(groovy.lang.Closure) - uploadMinSnapshotsToS3.library({identifier=jenkins@6.6.1, retriever=null}) + uploadMinSnapshotsToS3.library({identifier=jenkins@7.3.2, retriever=null}) uploadMinSnapshotsToS3.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() + uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/tar/builds/opensearch/manifest.yml}) uploadMinSnapshotsToS3.echo(Retreving build manifest from: /tmp/workspace/tar/builds/opensearch/manifest.yml) uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/tar/builds/opensearch/manifest.yml}) BuildManifest.asBoolean() + uploadMinSnapshotsToS3.fileExists(/tmp/workspace/tar/builds/opensearch/core-plugins) uploadMinSnapshotsToS3.echo(Create .sha512 for Min Snapshots Artifacts) createSha512Checksums.sh({script=find /tmp/workspace/tar/builds/opensearch/dist -type f, returnStdout=true}) createSha512Checksums.echo(Not generating sha for bbb in /tmp/workspace/tar/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) createSha512Checksums.echo(Not generating sha for ccc in /tmp/workspace/tar/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) - uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT architecture-x64 platform-darwin buildid-8469 distribution-tar extension-tar.gz) + uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT revision-3.0.0-SNAPSHOT-SNAPSHOT architecture-x64 platform-darwin buildid-8469 distribution-tar extension-tar.gz) uploadMinSnapshotsToS3.sh( cp -v /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64.tar.gz /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz cp -v /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64.tar.gz.sha512 /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.sha512 @@ -132,6 +140,7 @@ uploadMinSnapshotsToS3.string({credentialsId=jenkins-artifact-production-bucket-name, variable=ARTIFACT_PRODUCTION_BUCKET_NAME}) uploadMinSnapshotsToS3.withCredentials([ARTIFACT_PROMOTION_ROLE_NAME, AWS_ACCOUNT_ARTIFACT, ARTIFACT_PRODUCTION_BUCKET_NAME], groovy.lang.Closure) uploadMinSnapshotsToS3.withAWS({role=ARTIFACT_PROMOTION_ROLE_NAME, roleAccount=AWS_ACCOUNT_ARTIFACT, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure) + uploadMinSnapshotsToS3.echo(Upload min snapshots) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.sha512}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.build-manifest.yml}) @@ -145,7 +154,7 @@ publish-min-snapshots.sh(java -version) publish-min-snapshots.buildManifest({componentName=OpenSearch, inputManifest=manifests/3.0.0/opensearch-3.0.0.yml, platform=darwin, architecture=arm64, distribution=tar, snapshot=true}) buildManifest.legacySCM(groovy.lang.Closure) - buildManifest.library({identifier=jenkins@6.6.1, retriever=null}) + buildManifest.library({identifier=jenkins@7.3.2, retriever=null}) buildManifest.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() buildManifest.sh(./build.sh manifests/3.0.0/opensearch-3.0.0.yml -d tar --component OpenSearch -p darwin -a arm64 --snapshot) @@ -153,17 +162,19 @@ publish-min-snapshots.createSha512Checksums() publish-min-snapshots.uploadMinSnapshotsToS3({fileActions=[groovy.lang.Closure], distribution=tar}) uploadMinSnapshotsToS3.legacySCM(groovy.lang.Closure) - uploadMinSnapshotsToS3.library({identifier=jenkins@6.6.1, retriever=null}) + uploadMinSnapshotsToS3.library({identifier=jenkins@7.3.2, retriever=null}) uploadMinSnapshotsToS3.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() + uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/tar/builds/opensearch/manifest.yml}) uploadMinSnapshotsToS3.echo(Retreving build manifest from: /tmp/workspace/tar/builds/opensearch/manifest.yml) uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/tar/builds/opensearch/manifest.yml}) BuildManifest.asBoolean() + uploadMinSnapshotsToS3.fileExists(/tmp/workspace/tar/builds/opensearch/core-plugins) uploadMinSnapshotsToS3.echo(Create .sha512 for Min Snapshots Artifacts) createSha512Checksums.sh({script=find /tmp/workspace/tar/builds/opensearch/dist -type f, returnStdout=true}) createSha512Checksums.echo(Not generating sha for bbb in /tmp/workspace/tar/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) createSha512Checksums.echo(Not generating sha for ccc in /tmp/workspace/tar/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) - uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT architecture-arm64 platform-darwin buildid-8469 distribution-tar extension-tar.gz) + uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT revision-3.0.0-SNAPSHOT-SNAPSHOT architecture-arm64 platform-darwin buildid-8469 distribution-tar extension-tar.gz) uploadMinSnapshotsToS3.sh( cp -v /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64.tar.gz /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64-latest.tar.gz cp -v /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64.tar.gz.sha512 /tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64-latest.tar.gz.sha512 @@ -175,6 +186,7 @@ uploadMinSnapshotsToS3.string({credentialsId=jenkins-artifact-production-bucket-name, variable=ARTIFACT_PRODUCTION_BUCKET_NAME}) uploadMinSnapshotsToS3.withCredentials([ARTIFACT_PROMOTION_ROLE_NAME, AWS_ACCOUNT_ARTIFACT, ARTIFACT_PRODUCTION_BUCKET_NAME], groovy.lang.Closure) uploadMinSnapshotsToS3.withAWS({role=ARTIFACT_PROMOTION_ROLE_NAME, roleAccount=AWS_ACCOUNT_ARTIFACT, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure) + uploadMinSnapshotsToS3.echo(Upload min snapshots) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64-latest.tar.gz}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64-latest.tar.gz.sha512}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64-latest.tar.gz.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-arm64-latest.tar.gz.build-manifest.yml}) @@ -188,7 +200,7 @@ publish-min-snapshots.sh(scoop reset `scoop list jdk | cut -d ' ' -f1 | grep 17 | head -1`) publish-min-snapshots.buildManifest({componentName=OpenSearch, inputManifest=manifests/3.0.0/opensearch-3.0.0.yml, platform=windows, architecture=x64, distribution=zip, snapshot=true}) buildManifest.legacySCM(groovy.lang.Closure) - buildManifest.library({identifier=jenkins@6.6.1, retriever=null}) + buildManifest.library({identifier=jenkins@7.3.2, retriever=null}) buildManifest.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() buildManifest.sh(./build.sh manifests/3.0.0/opensearch-3.0.0.yml -d zip --component OpenSearch -p windows -a x64 --snapshot) @@ -196,17 +208,19 @@ publish-min-snapshots.createSha512Checksums() publish-min-snapshots.uploadMinSnapshotsToS3({fileActions=[groovy.lang.Closure], distribution=zip}) uploadMinSnapshotsToS3.legacySCM(groovy.lang.Closure) - uploadMinSnapshotsToS3.library({identifier=jenkins@6.6.1, retriever=null}) + uploadMinSnapshotsToS3.library({identifier=jenkins@7.3.2, retriever=null}) uploadMinSnapshotsToS3.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() + uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/zip/builds/opensearch/manifest.yml}) uploadMinSnapshotsToS3.echo(Retreving build manifest from: /tmp/workspace/zip/builds/opensearch/manifest.yml) uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/zip/builds/opensearch/manifest.yml}) BuildManifest.asBoolean() + uploadMinSnapshotsToS3.fileExists(/tmp/workspace/zip/builds/opensearch/core-plugins) uploadMinSnapshotsToS3.echo(Create .sha512 for Min Snapshots Artifacts) createSha512Checksums.sh({script=find /tmp/workspace/zip/builds/opensearch/dist -type f, returnStdout=true}) createSha512Checksums.echo(Not generating sha for bbb in /tmp/workspace/zip/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) createSha512Checksums.echo(Not generating sha for ccc in /tmp/workspace/zip/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) - uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT architecture-x64 platform-windows buildid-8469 distribution-zip extension-zip) + uploadMinSnapshotsToS3.echo(Start copying files: version-3.0.0-SNAPSHOT revision-3.0.0-SNAPSHOT-SNAPSHOT architecture-x64 platform-windows buildid-8469 distribution-zip extension-zip) uploadMinSnapshotsToS3.sh( cp -v /tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64.zip /tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip cp -v /tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64.zip.sha512 /tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.sha512 @@ -218,6 +232,7 @@ uploadMinSnapshotsToS3.string({credentialsId=jenkins-artifact-production-bucket-name, variable=ARTIFACT_PRODUCTION_BUCKET_NAME}) uploadMinSnapshotsToS3.withCredentials([ARTIFACT_PROMOTION_ROLE_NAME, AWS_ACCOUNT_ARTIFACT, ARTIFACT_PRODUCTION_BUCKET_NAME], groovy.lang.Closure) uploadMinSnapshotsToS3.withAWS({role=ARTIFACT_PROMOTION_ROLE_NAME, roleAccount=AWS_ACCOUNT_ARTIFACT, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure) + uploadMinSnapshotsToS3.echo(Upload min snapshots) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.sha512}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.build-manifest.yml}) From 38531f9ad812c1f57da7679c8de9b5ffb92d6d79 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 5 Nov 2024 16:50:57 -0500 Subject: [PATCH 2/3] Add core-plugins tests Signed-off-by: Peter Zhu --- tests/jenkins/TestPublishMinSnapshots.groovy | 2 ++ .../publish-min-snapshots.jenkinsfile.txt | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/tests/jenkins/TestPublishMinSnapshots.groovy b/tests/jenkins/TestPublishMinSnapshots.groovy index fe0d189cea..b9c89e7b2d 100644 --- a/tests/jenkins/TestPublishMinSnapshots.groovy +++ b/tests/jenkins/TestPublishMinSnapshots.groovy @@ -57,6 +57,7 @@ class TestPublishMinSnapshots extends BuildPipelineTest { return helper.callClosure(closure) }) helper.registerAllowedMethod('s3Upload', [Map], {}) + helper.registerAllowedMethod('fileExists', [String], { true }) } @Test @@ -105,6 +106,7 @@ class TestPublishMinSnapshots extends BuildPipelineTest { // macos-x64-upload '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz}', '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.sha512}', '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.build-manifest.yml}')) + assertThat(getCommands('s3Upload', 'plugins'), hasItems('{bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/ingest-attachment-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/ingest-attachment-3.0.0-SNAPSHOT.zip*}')) } def getCommands(String methodName, String commandString) { diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt index 38dfdfc8c9..4f5f0c3514 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt @@ -35,6 +35,10 @@ uploadMinSnapshotsToS3.readYaml({file=/tmp/workspace/tar/builds/opensearch/manifest.yml}) BuildManifest.asBoolean() uploadMinSnapshotsToS3.fileExists(/tmp/workspace/tar/builds/opensearch/core-plugins) + uploadMinSnapshotsToS3.echo(Create .sha512 for Core Plugins Snapshots) + createSha512Checksums.sh({script=find /tmp/workspace/tar/builds/opensearch/core-plugins -type f, returnStdout=true}) + createSha512Checksums.echo(Not generating sha for bbb in /tmp/workspace/tar/builds/opensearch/core-plugins, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) + createSha512Checksums.echo(Not generating sha for ccc in /tmp/workspace/tar/builds/opensearch/core-plugins, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) uploadMinSnapshotsToS3.echo(Create .sha512 for Min Snapshots Artifacts) createSha512Checksums.sh({script=find /tmp/workspace/tar/builds/opensearch/dist -type f, returnStdout=true}) createSha512Checksums.echo(Not generating sha for bbb in /tmp/workspace/tar/builds/opensearch/dist, doesn't match allowed types [.tar.gz, .zip, .rpm, .deb]) @@ -55,6 +59,32 @@ uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.sha512}) uploadMinSnapshotsToS3.s3Upload({file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.build-manifest.yml}) + uploadMinSnapshotsToS3.echo(Upload core-plugins snapshots) + uploadMinSnapshotsToS3.echo(corePluginList: [core-plugins/ingest-attachment-3.0.0-SNAPSHOT.zip, core-plugins/repository-azure-3.0.0-SNAPSHOT.zip, core-plugins/mapper-murmur3-3.0.0-SNAPSHOT.zip, core-plugins/discovery-gce-3.0.0-SNAPSHOT.zip, core-plugins/repository-s3-3.0.0-SNAPSHOT.zip, core-plugins/analysis-phonetic-3.0.0-SNAPSHOT.zip, core-plugins/analysis-smartcn-3.0.0-SNAPSHOT.zip, core-plugins/identity-shiro-3.0.0-SNAPSHOT.zip, core-plugins/discovery-azure-classic-3.0.0-SNAPSHOT.zip, core-plugins/discovery-ec2-3.0.0-SNAPSHOT.zip, core-plugins/analysis-stempel-3.0.0-SNAPSHOT.zip, core-plugins/analysis-kuromoji-3.0.0-SNAPSHOT.zip, core-plugins/crypto-kms-3.0.0-SNAPSHOT.zip, core-plugins/analysis-ukrainian-3.0.0-SNAPSHOT.zip, core-plugins/analysis-icu-3.0.0-SNAPSHOT.zip, core-plugins/analysis-nori-3.0.0-SNAPSHOT.zip, core-plugins/repository-gcs-3.0.0-SNAPSHOT.zip, core-plugins/events-correlation-engine-3.0.0-SNAPSHOT.zip, core-plugins/mapper-size-3.0.0-SNAPSHOT.zip, core-plugins/telemetry-otel-3.0.0-SNAPSHOT.zip, core-plugins/store-smb-3.0.0-SNAPSHOT.zip, core-plugins/transport-nio-3.0.0-SNAPSHOT.zip, core-plugins/mapper-annotated-text-3.0.0-SNAPSHOT.zip, core-plugins/repository-hdfs-3.0.0-SNAPSHOT.zip]) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/ingest-attachment-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/ingest-attachment-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/repository-azure-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/repository-azure-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/mapper-murmur3-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/mapper-murmur3-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/discovery-gce-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/discovery-gce-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/repository-s3-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/repository-s3-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/analysis-phonetic-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/analysis-phonetic-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/analysis-smartcn-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/analysis-smartcn-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/identity-shiro-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/identity-shiro-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/discovery-azure-classic-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/discovery-azure-classic-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/discovery-ec2-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/discovery-ec2-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/analysis-stempel-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/analysis-stempel-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/analysis-kuromoji-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/analysis-kuromoji-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/crypto-kms-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/crypto-kms-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/analysis-ukrainian-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/analysis-ukrainian-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/analysis-icu-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/analysis-icu-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/analysis-nori-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/analysis-nori-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/repository-gcs-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/repository-gcs-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/events-correlation-engine-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/events-correlation-engine-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/mapper-size-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/mapper-size-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/telemetry-otel-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/telemetry-otel-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/store-smb-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/store-smb-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/transport-nio-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/transport-nio-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/mapper-annotated-text-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/mapper-annotated-text-3.0.0-SNAPSHOT.zip*}) + uploadMinSnapshotsToS3.s3Upload({bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/repository-hdfs-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/repository-hdfs-3.0.0-SNAPSHOT.zip*}) publish-min-snapshots.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) publish-min-snapshots.stage(linux-arm64-tar, groovy.lang.Closure) From a110bea2921629603dcb83883dfef7afe5088f29 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 5 Nov 2024 19:00:51 -0500 Subject: [PATCH 3/3] Update gradle check to use same 7.3.2 version Signed-off-by: Peter Zhu --- jenkins/gradle/gradle-check.jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/gradle/gradle-check.jenkinsfile b/jenkins/gradle/gradle-check.jenkinsfile index abdc0791df..d266ed7572 100644 --- a/jenkins/gradle/gradle-check.jenkinsfile +++ b/jenkins/gradle/gradle-check.jenkinsfile @@ -7,7 +7,7 @@ * compatible open source license. */ -lib = library(identifier: 'jenkins@7.2.0', retriever: modernSCM([ +lib = library(identifier: 'jenkins@7.3.2', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', ]))