Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump publish min artifacts to use 6.6.1 libs #4866

Merged
merged 4 commits into from
Jul 19, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
202 changes: 101 additions & 101 deletions jenkins/opensearch/publish-min-snapshots.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/

lib = library(identifier: 'jenkins@5.12.0', retriever: modernSCM([
lib = library(identifier: 'jenkins@6.6.1', retriever: modernSCM([
$class: 'GitSCMSource',
remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
]))
Expand Down Expand Up @@ -52,72 +52,72 @@ pipeline {
}
stage('Build OpenSearch-min Snapshots') {
parallel {
stage('linux-x64-tar') {
agent {
docker {
label AGENT_LINUX_X64
image dockerAgent.image
args dockerAgent.args
registryUrl 'https://public.ecr.aws/'
alwaysPull true
}
}
steps {
script {
buildManifest(
componentName: "OpenSearch",
inputManifest: "manifests/${INPUT_MANIFEST}",
platform: 'linux',
architecture: 'x64',
distribution: 'tar',
snapshot: true
)
echo("Uploading linux x64 tar min snapshots to S3")
uploadMinSnapshotsToS3(
fileActions: [createSha512Checksums()],
distribution: 'tar'
)
}
}
post {
always {
postCleanup()
}
}
}
stage('linux-arm64-tar') {
agent {
docker {
label AGENT_LINUX_ARM64
image dockerAgent.image
args dockerAgent.args
registryUrl 'https://public.ecr.aws/'
alwaysPull true
}
}
steps {
script {
buildManifest(
componentName: "OpenSearch",
inputManifest: "manifests/${INPUT_MANIFEST}",
platform: 'linux',
architecture: 'arm64',
distribution: 'tar',
snapshot: true
)
echo("Uploading linux arm64 tar min snapshots to S3")
uploadMinSnapshotsToS3(
fileActions: [createSha512Checksums()],
distribution: 'tar'
)
}
}
post {
always {
postCleanup()
}
}
}
//stage('linux-x64-tar') {
peterzhuamazon marked this conversation as resolved.
Show resolved Hide resolved
// agent {
// docker {
// label AGENT_LINUX_X64
// image dockerAgent.image
// args dockerAgent.args
// registryUrl 'https://public.ecr.aws/'
// alwaysPull true
// }
// }
// steps {
// script {
// buildManifest(
// componentName: "OpenSearch",
// inputManifest: "manifests/${INPUT_MANIFEST}",
// platform: 'linux',
// architecture: 'x64',
// distribution: 'tar',
// snapshot: true
// )
// echo("Uploading linux x64 tar min snapshots to S3")
// uploadMinSnapshotsToS3(
// fileActions: [createSha512Checksums()],
// distribution: 'tar'
// )
// }
// }
// post {
// always {
// postCleanup()
// }
// }
//}
//stage('linux-arm64-tar') {
// agent {
// docker {
// label AGENT_LINUX_ARM64
// image dockerAgent.image
// args dockerAgent.args
// registryUrl 'https://public.ecr.aws/'
// alwaysPull true
// }
// }
// steps {
// script {
// buildManifest(
// componentName: "OpenSearch",
// inputManifest: "manifests/${INPUT_MANIFEST}",
// platform: 'linux',
// architecture: 'arm64',
// distribution: 'tar',
// snapshot: true
// )
// echo("Uploading linux arm64 tar min snapshots to S3")
// uploadMinSnapshotsToS3(
// fileActions: [createSha512Checksums()],
// distribution: 'tar'
// )
// }
// }
// post {
// always {
// postCleanup()
// }
// }
//}
stage('macos-x64-tar') {
agent {
node {
Expand Down Expand Up @@ -182,40 +182,40 @@ pipeline {
}
}
}
stage('windows-x64-zip') {
agent {
docker {
label AGENT_WINDOWS_X64
image IMAGE_WINDOWS_ZIP
registryUrl 'https://public.ecr.aws/'
alwaysPull true
}
}
steps {
script {
echo("Switching to Java ${env.javaVersionNumber} on Windows Docker Container")
sh("scoop reset `scoop list jdk | cut -d ' ' -f1 | grep ${env.javaVersionNumber} | head -1`")
buildManifest(
componentName: "OpenSearch",
inputManifest: "manifests/${INPUT_MANIFEST}",
platform: 'windows',
architecture: 'x64',
distribution: 'zip',
snapshot: true
)
echo("Uploading windows x64 zip min snapshots to S3")
uploadMinSnapshotsToS3(
fileActions: [createSha512Checksums()],
distribution: 'zip'
)
}
}
post {
always {
postCleanup()
}
}
}
//stage('windows-x64-zip') {
// agent {
// docker {
// label AGENT_WINDOWS_X64
// image IMAGE_WINDOWS_ZIP
// registryUrl 'https://public.ecr.aws/'
// alwaysPull true
// }
// }
// steps {
// script {
// echo("Switching to Java ${env.javaVersionNumber} on Windows Docker Container")
// sh("scoop reset `scoop list jdk | cut -d ' ' -f1 | grep ${env.javaVersionNumber} | head -1`")
// buildManifest(
// componentName: "OpenSearch",
// inputManifest: "manifests/${INPUT_MANIFEST}",
// platform: 'windows',
// architecture: 'x64',
// distribution: 'zip',
// snapshot: true
// )
// echo("Uploading windows x64 zip min snapshots to S3")
// uploadMinSnapshotsToS3(
// fileActions: [createSha512Checksums()],
// distribution: 'zip'
// )
// }
// }
// post {
// always {
// postCleanup()
// }
// }
//}
}
}
}
Expand Down
Loading