Merge 3.5.x release with master (#297)

* Fixes from master applied to 3.5.x (#251)

* Update mesos plugin hash to include instrumentation

* Update default agent to 0.6.0 (#207)

* Update mesos plugin (#210)

* Update jackson plugin to latest

* Discover jenkins with autoip host name instead of host:port (#249)

Address [COPS-3395](https://jira.mesosphere.com/browse/COPS-3395)

* Always update the URL in mesos cloud config (#252)

* Always update the URL in mesos cloud config

The assigned port is dynamic and may change between runs.

* Always update Jenkins URL

* Update CHANGELOG for 3.5.1 (#253)

* Changed Jenkins URL to support Jenkins when deployed to a MoM. (#261)

* Fixing Mesos DNS name handling. (#273)

* [COPS-4290] Bump jenkins base version and plugins (#283)

* bump jenkins base tech 2.150.1

* Setting 'keepalive' for nginx

Research has indicated that this could help reduce '504 timeout'
errors and stress on the system when nginx is functioning as
a revers proxy.  Adding the server directives for keepalive
as noted here:

http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive

* bump libmesos version

* remove stale files

* removing stale files

* bump blue ocean plugins

* updating jenkins lts release

* bump branch api plugin

* seperate plugins from dockerfile

* seperate plugins

* nit: newline

* Bump plugins to help with jenkins timeouts (#286)

* udate plugins and nginx

* bump plugin

* remove unused file

* Fix Jenkins on strict mode (#290)

* new LTS version of Jenkins (#292)

blueocean 1.14.0
nginx 1.10.3
various plugin updates

* new LTS version of Jenkins (#294)

* new LTS version of Jenkins (#295)

* Add gid, uid=99 for nobody user.

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changes
 
+## v3.5.5-2.176.3 (2019-08-29)
+  * Updates to Jenkins LTS 2.176.3
+  * Updates blueocean to version 1.18.1
+  * Updates various plugins
+  * Updates nginx to 1.10.3
+
+## v3.5.1-2.107.2 (2018-06-26)
+  * Set mesos URL to use the autoip DNS
+  * Update mesos plugin
+  * Update jackson2 plugin to 2.8.11.3
+  * Update default DIND image to 0.6.0
+
 ## v3.5.0-2.107.2 (2018-04-17)
   * Addresses security bulletin for 2018-04-11
   * Updates blueocean to version 1.5.0

Dockerfile

@@ -12,11 +12,12 @@ ENV JENKINS_FOLDER /usr/share/jenkins
 # Build Args
 ARG LIBMESOS_DOWNLOAD_URL=https://downloads.mesosphere.io/libmesos-bundle/libmesos-bundle-1.14-beta.tar.gz 
 ARG BLUEOCEAN_VERSION=1.19.0
+
 ARG JENKINS_STAGING=/usr/share/jenkins/ref/
 ARG MESOS_PLUG_HASH=0193c06a66007247eff371ba74ddc89c56993ddb
 ARG PROMETHEUS_PLUG_HASH=61ea0cd0bb26d937c8f4df00c7e226c0b51c7b50
 ARG STATSD_PLUG_HASH=929d4a6cb3d3ce5f1e03af73075b13687d4879c8
-ARG JENKINS_DCOS_HOME=/var/jenkinsdcos_home
+ARG JENKINS_DCOS_HOME=/var/jenkins_home
 ARG user=nobody
 ARG uid=99
 ARG gid=99

README.md

@@ -18,6 +18,7 @@ Please report issues and submit feature requests for Jenkins on DC/OS by [creati
 
 ## Included in this repo
 Base packages:
+
   * [Jenkins][jenkins-home] 2.190.1 (LTS)
   * [Nginx][nginx-home] 1.10.1
 
@@ -149,6 +150,7 @@ Jenkins plugins:
   * workflow-step-api v2.20
   * workflow-support v3.3
 
+
 ## Packaging
 Jenkins is available as a package in the [Mesosphere Universe][universe].
 To make changes to the Jenkins package, submit a pull request against the

conf/jenkins/config.xml

@@ -44,7 +44,7 @@
           <defaultSlave>false</defaultSlave>
           <containerInfo>
             <type>MESOS</type>
-            <dockerImage>mesosphere/jenkins-dind:scale</dockerImage>
+            <dockerImage>mesosphere/jenkins-dind:0.7.0</dockerImage>
             <networking>BRIDGE</networking>
             <useCustomDockerCommandShell>true</useCustomDockerCommandShell>
             <customDockerCommandShell>wrapper.sh</customDockerCommandShell>

scripts/init.groovy.d/mesos-auth.groovy

@@ -34,10 +34,12 @@ def changePassword = { userName ->
 
 // the env var is set by DCOS when using a service account to run Jenkins
 def accountCreds = System.getenv("DCOS_SERVICE_ACCOUNT_CREDENTIAL")
+def sleepTimeStr = System.getenv("DCOS_JENKINS_MESOS_PLUGIN_BOOT_TIME")
+def sleepTime = sleepTimeStr == null ? 60000 : Integer.parseInt(sleepTimeStr)
 if (accountCreds) {
   Thread.start {
-    // wait 30s, this gives the mesos plugin time to start
-    sleep 30000
+    // wait 60s, this gives the mesos plugin time to start
+    sleep sleepTime
     def credURL = new URL(accountCreds)
     def credFile = new File(credURL.toURI())
     def credJSON = new groovy.json.JsonSlurper().parseText(credFile.text)