diff options
| author | Sven Gothel <[email protected]> | 2013-06-23 12:24:06 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-06-23 12:24:06 +0200 |
| commit | 909a1bed99fa5f07fc3f4ec6564ffde529a5162b (patch) | |
| tree | 217dcf5437389f6f53c50ffcd6f96da3605d0fe3 /jenkins-server-slave-setup/scripts | |
| parent | 5f6fa9f5cb681718029c00a7d1e508d1a88c0544 (diff) | |
Bug 758: Update all Jenkins Nodes to use Java7 building Java6 and new Security JAR tags.
Diffstat (limited to 'jenkins-server-slave-setup/scripts')
| -rwxr-xr-x | jenkins-server-slave-setup/scripts/start.jenkins.sh | 2 | ||||
| -rwxr-xr-x | jenkins-server-slave-setup/scripts/starthudson.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jenkins-server-slave-setup/scripts/start.jenkins.sh b/jenkins-server-slave-setup/scripts/start.jenkins.sh index 71562ed..cacc638 100755 --- a/jenkins-server-slave-setup/scripts/start.jenkins.sh +++ b/jenkins-server-slave-setup/scripts/start.jenkins.sh @@ -4,7 +4,7 @@ export JENKINS_WAR=$JENKINS_HOME/jenkins.war export JENKINS_LOG=$JENKINS_HOME/jenkins.log #export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::") -export JAVA_HOME=/opt-linux-x86_64/jre6 +export JAVA_HOME=/opt-linux-x86_64/jre7 JAVA=$JAVA_HOME/bin/java nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 & diff --git a/jenkins-server-slave-setup/scripts/starthudson.sh b/jenkins-server-slave-setup/scripts/starthudson.sh index 47fcac9..aea50f3 100755 --- a/jenkins-server-slave-setup/scripts/starthudson.sh +++ b/jenkins-server-slave-setup/scripts/starthudson.sh @@ -4,7 +4,7 @@ FLAGS="-server -Xms256m -Xmx512m -XX:MaxPermSize=128m -XX:+UseConcMarkSweepGC -X HUDSON_HOME=/srv/hudson/config export HUDSON_HOME -. /opt-linux-x86_64/etc/profile.jre6 +. /opt-linux-x86_64/etc/profile.jre7 . /opt-share/etc/profile.ant -/opt-linux-x86_64/jre6/bin/java ${FLAGS} -jar /srv/hudson/hudson.war 2>&1 | tee hudson.log +/opt-linux-x86_64/jre7/bin/java ${FLAGS} -jar /srv/hudson/hudson.war 2>&1 | tee hudson.log |