Replace jenv local with jenv global for macOS snapshots JDK switch (#…

…4318) Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Jan 2, 2024 · 1bb1d0e · 1bb1d0e
1 parent 11f9ea4
commit 1bb1d0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/jenkins/opensearch/publish-min-snapshots.jenkinsfile b/jenkins/opensearch/publish-min-snapshots.jenkinsfile
@@ -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}",

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
@@ -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)