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.

Sign up for GitHub

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

Replace jenv local with jenv global for macOS snapshots JDK switch #4318

Merged
merged 2 commits into from
Jan 2, 2024
Merged

Replace jenv local with jenv global for macOS snapshots JDK switch #4318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60db549
Replace jenv local with jenv global for macOS snapshots JDK switch
peterzhuamazon Jan 2, 2024
633beb5
Update test cases
peterzhuamazon Jan 2, 2024
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
5 changes: 3 additions & 2 deletions jenkins/opensearch/publish-min-snapshots.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ pipeline {
}
steps {
script {
echo("Switching to Java ${env.javaVersionNumber} on Mac Docker Container")
sh("jenv local ${dockerAgent.javaVersion}")
echo("Switching to Java ${env.javaVersionNumber} on MacOS")
sh("jenv global ${dockerAgent.javaVersion}")
sh("java -version")
buildManifest(
componentName: "OpenSearch",
inputManifest: "manifests/${INPUT_MANIFEST}",
Expand Down
5 changes: 3 additions & 2 deletions tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,9 @@
publish-min-snapshots.stage(macos-x64-tar, groovy.lang.Closure)
publish-min-snapshots.echo(Executing on agent [label:Jenkins-Agent-MacOS12-X64-Mac1Metal-Multi-Host])
publish-min-snapshots.script(groovy.lang.Closure)
publish-min-snapshots.echo(Switching to Java 17 on Mac Docker Container)
publish-min-snapshots.sh(jenv local openjdk-17)
publish-min-snapshots.echo(Switching to Java 17 on MacOS)
publish-min-snapshots.sh(jenv global openjdk-17)
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.sh(./build.sh manifests/3.0.0/opensearch-3.0.0.yml -d tar --component OpenSearch -p darwin -a x64 --snapshot)
publish-min-snapshots.echo(Uploading darwin min snapshots to S3)
Expand Down
Loading