summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-11-08 11:30:50 +0100
committerSven Gothel <[email protected]>2013-11-08 11:30:50 +0100
commit37dfed70b4239ab4d59430b7b1a365c08e83f539 (patch)
treec2ddbd157b6d5bf0c925dc504dbb0682f97216e1
parentaf661b4fc9e7d5761a6dbbe511e1d7bd70085330 (diff)
Fix Jenkin's $JENKINS_HOME/war/ content, since $JENKINS_HOME/war/WEB-INF/slave.jar is being used by slaves (scp fetching)
Once we started Jenkins w/ a method where the jenkins.war file got inflated into $JENKINS_HOME/war/, but since after 'Apr 9 2013' this is no more the case - last timestamp. Update the folder manually at startup!
-rwxr-xr-xjenkins-server-slave-setup/scripts/start.jenkins.sh7
-rwxr-xr-xjenkins-server-slave-setup/scripts/update.jenkins.war_folder.sh11
2 files changed, 18 insertions, 0 deletions
diff --git a/jenkins-server-slave-setup/scripts/start.jenkins.sh b/jenkins-server-slave-setup/scripts/start.jenkins.sh
index cacc638..390775a 100755
--- a/jenkins-server-slave-setup/scripts/start.jenkins.sh
+++ b/jenkins-server-slave-setup/scripts/start.jenkins.sh
@@ -7,6 +7,13 @@ export JENKINS_LOG=$JENKINS_HOME/jenkins.log
export JAVA_HOME=/opt-linux-x86_64/jre7
JAVA=$JAVA_HOME/bin/java
+cd $JENKINS_HOME
+rm -rf war
+mkdir -p war
+cd war
+unzip $JENKINS_WAR
+cd $JENKINS_HOME
+
nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &
# nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=-1 --httpsPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &
diff --git a/jenkins-server-slave-setup/scripts/update.jenkins.war_folder.sh b/jenkins-server-slave-setup/scripts/update.jenkins.war_folder.sh
new file mode 100755
index 0000000..ec7efbd
--- /dev/null
+++ b/jenkins-server-slave-setup/scripts/update.jenkins.war_folder.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+export JENKINS_HOME=/srv/jenkins
+export JENKINS_WAR=$JENKINS_HOME/jenkins.war
+
+cd $JENKINS_HOME
+rm -rf war
+mkdir -p war
+cd war
+unzip $JENKINS_WAR
+cd $JENKINS_HOME
+