Adding persistant JENKINS_HOME support

Author: yvlasov

mesos/jenkins/Dockerfile

@@ -57,9 +57,6 @@ RUN chmod a+x /usr/local/bin/connect-slave.sh
 COPY jenkins.sh /usr/local/bin/jenkins.sh
 RUN chmod a+x /usr/local/bin/jenkins.sh
 
-COPY gitconfig $JENKINS_HOME/.gitconfig
-RUN chown jenkins:jenkins $JENKINS_HOME/.gitconfig
-
 ENV REF_DIR /usr/share/jenkins/ref
 ADD defaults.tgz $REF_DIR
 COPY plugins.txt $REF_DIR/

mesos/jenkins/Makefile

@@ -7,7 +7,7 @@ MARATHON 	?= localhost:8080
 .PHONY = install push deploy clean
 
 defaults.tgz:
-	tar zcvf $(@) *.xml init.groovy.d/
+	tar zcvf $(@) *.xml gitconfig init.groovy.d/
 
 install: defaults.tgz
 	docker build -t $(TAG) .

mesos/jenkins/connect-slave.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 curl -sSL -XPOST -H "Content-Type: application/json" -d @- "http://marathon.mesos:8080/v2/apps" <<END
 {
-  "id": "/jenkins/build/$3",
+  "id": "/jenkins/slaves/$3",
   "cpus": 1,
   "mem": 8192,
   "instances": 1,

mesos/jenkins/jenkins.sh

@@ -25,16 +25,30 @@ copy_reference_file() {
 : ${JENKINS_HOME:="/var/jenkins_home"}
 export -f copy_reference_file
 touch "${COPY_REFERENCE_FILE_LOG}" || (echo "Can not write to ${COPY_REFERENCE_FILE_LOG}. Wrong volume permissions?" && exit 1)
-echo "--- Copying files at $(date)" >> "$COPY_REFERENCE_FILE_LOG"
-find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \;
 
-sed -i "s#\${JENKINS_CONFIG_REPO}#$JENKINS_CONFIG_REPO#g" $JENKINS_HOME/scm-sync-configuration.xml
-cp -R $MESOS_SANDBOX/.ssh $JENKINS_HOME/.ssh
+if [ "x$USE_PERSISTANT_JENKINS_HOME" == "x" ]; then
+	rm -f $JENKINS_HOME/.USE_PERSISTANT_JENKINS_HOME
+	echo "--- Copying files at $(date)" >> "$COPY_REFERENCE_FILE_LOG"
+	find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \;
+	sed -i "s#\${JENKINS_CONFIG_REPO}#$JENKINS_CONFIG_REPO#g" $JENKINS_HOME/scm-sync-configuration.xml
+	cp -R $MESOS_SANDBOX/.ssh $JENKINS_HOME/.ssh
+else
+	if [ ! -f $JENKINS_HOME/.USE_PERSISTANT_JENKINS_HOME ]; then
+		echo "--- Copying files at $(date)" >> "$COPY_REFERENCE_FILE_LOG"
+		find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \;
+		sed -i "s#\${JENKINS_CONFIG_REPO}#$JENKINS_CONFIG_REPO#g" $JENKINS_HOME/scm-sync-configuration.xml
+		cp -R $MESOS_SANDBOX/.ssh $JENKINS_HOME/.ssh
+	    touch $JENKINS_HOME/.USE_PERSISTANT_JENKINS_HOME
+	fi
+fi
+if [ [ ! -f $JENKINS_HOME/.gitconfig ] -a [ -f $JENKINS_HOME/gitconfig ] ]; then
+	mv -f $JENKINS_HOME/gitconfig $JENKINS_HOME/.gitconfig
+fi
 
 # if `docker run` first argument start with `--` the user is passing jenkins launcher arguments
 if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
   eval "exec java $JAVA_OPTS -jar /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\""
-fi
-
+else
 # As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image
-exec "$@"
+  exec "$@"
+fi

mesos/jenkins/marathon-remote.json.tmpl

@@ -0,0 +1,88 @@
+{
+  "id": "/jenkins/master",
+  "cmd": null,
+  "cpus": 2,
+  "mem": 4096,
+  "disk": 0,
+  "instances": 1,
+  "constraints": [
+    [
+      "hostname",
+      "CLUSTER",
+      "10.0.24.35"
+    ]
+  ],
+  "container": {
+    "type": "DOCKER",
+    "volumes": [
+      {
+        "containerPath": "/var/run/docker.sock",
+        "hostPath": "/var/run/docker.sock",
+        "mode": "RW"
+      }
+    ],
+    "docker": {
+      "image": "jenkins-mesos-local",
+      "network": "BRIDGE",
+      "portMappings": [
+        {
+          "containerPort": 8080,
+          "hostPort": 31325,
+          "servicePort": 10002,
+          "protocol": "tcp",
+          "labels": {}
+        },
+        {
+          "containerPort": 0,
+          "hostPort": 0,
+          "servicePort": 10003,
+          "protocol": "tcp",
+          "labels": {}
+        }
+      ],
+      "privileged": true,
+      "parameters": [],
+      "forcePullImage": false,
+      "parameters": [
+                { "key": "volumes-from", "value": "jenkins-home" }
+            ]
+    }
+  },
+  "env": {
+    "JENKINS_CONFIG_REPO": "jbrisbin/jenkins-mesos-softlayer",
+    "JENKINS_OPTS": "--prefix=/jenkins",
+    "USE_PERSISTANT_JENKINS_HOME": "yes"
+  },
+  "healthChecks": [
+    {
+      "path": "/jenkins/",
+      "protocol": "HTTP",
+      "portIndex": 0,
+      "gracePeriodSeconds": 300,
+      "intervalSeconds": 300,
+      "timeoutSeconds": 300,
+      "maxConsecutiveFailures": 25,
+      "ignoreHttp1xx": false
+    }
+  ],
+  "portDefinitions": [
+    {
+      "port": 10002,
+      "protocol": "tcp",
+      "labels": {}
+    },
+    {
+      "port": 10003,
+      "protocol": "tcp",
+      "labels": {}
+    }
+  ],
+  "fetch": [
+    {
+      "uri": "file:///home/jenkins/ssh.tar.gz",
+      "extract": true,
+      "executable": false,
+      "cache": false
+    }
+  ]
+}