diff options
| author | Sven Gothel <[email protected]> | 2019-04-05 03:45:52 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-05 03:45:52 +0200 |
| commit | 7638081d3fb02d32c1ff65d1d4e9b07ddcf09332 (patch) | |
| tree | df7ae9d751a861865bdba6617ad033c59a73618e | |
| parent | 9011a5d528d4b6dc09fd8cc6d92ff8dd582be197 (diff) | |
Jenkins OSX Node 12 Uses Java 1.8 (Node 13 offline)
3 files changed, 3 insertions, 3 deletions
diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.load.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.load.sh index 634497b..798ae7f 100644 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.load.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.load.sh @@ -1,5 +1,5 @@ #! /bin/sh launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-012.plist -launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-013.plist +#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-013.plist diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.update.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.update.sh index 4d415a9..a5cd8a6 100644 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.update.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.update.sh @@ -2,7 +2,7 @@ mkdir -p ~/Library/LaunchAgents cp com.jogamp.launched.start-ssh-jenkins-012.plist ~/Library/LaunchAgents/ -cp com.jogamp.launched.start-ssh-jenkins-013.plist ~/Library/LaunchAgents/ +#cp com.jogamp.launched.start-ssh-jenkins-013.plist ~/Library/LaunchAgents/ #launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-012.plist #launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-013.plist diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh index 7259e12..86b4f32 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh @@ -6,7 +6,7 @@ cd /Users/jogamp/jenkins curl -o agent-012.jar https://jogamp.org/chuck/jnlpJars/agent.jar . ./profile.ant -JAVA_HOME=`/usr/libexec/java_home` +JAVA_HOME=`/usr/libexec/java_home -version 1.8` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH export SOURCE_LEVEL=1.6 |