Fix mesos-plugin upgrade process (#310)

* Remove old mesos-plugin if one exists to allow for seamless plugin upgrades.

* Update README to include the mesos 1.0.0 plugin.

* Update Dockerfile

Add instructions for adding development versions of `mesos.hpi` files.

Dockerfile

@@ -13,7 +13,6 @@ ENV JENKINS_FOLDER /usr/share/jenkins
 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
@@ -63,11 +62,12 @@ COPY plugins.conf /tmp/
 RUN sed -i "s/\${BLUEOCEAN_VERSION}/${BLUEOCEAN_VERSION}/g" /tmp/plugins.conf
 RUN /usr/local/bin/install-plugins.sh < /tmp/plugins.conf
 
-# add mesos plugin
-ADD https://infinity-artifacts.s3.amazonaws.com/mesos-jenkins/mesos.hpi-${MESOS_PLUG_HASH} "${JENKINS_STAGING}/plugins/mesos.hpi"
 ADD https://infinity-artifacts.s3.amazonaws.com/prometheus-jenkins/prometheus.hpi-${PROMETHEUS_PLUG_HASH} "${JENKINS_STAGING}/plugins/prometheus.hpi"
 ADD https://infinity-artifacts.s3.amazonaws.com/statsd-jenkins/metrics-graphite.hpi-${STATSD_PLUG_HASH} "${JENKINS_STAGING}/plugins/metrics-graphite.hpi"
 
+# Note: For development purposes, the developer can COPY a pre-release mesos.hpi file into JENKINS_STAGING/plugins/mesos.jpi
+# The new naming convention is to use *.jpi files instead of *.hpi files.
+
 RUN chmod -R ugo+rw "$JENKINS_HOME" "${JENKINS_FOLDER}" \
     && chmod -R ugo+r "${JENKINS_STAGING}" \
     && chmod -R ugo+rx /usr/local/jenkins/bin/ \

README.md

@@ -94,6 +94,7 @@ Jenkins plugins:
   * matrix-project v1.14
   * maven-plugin v3.4
   * mercurial v2.8
+  * mesos v1.0.0
   * metrics v4.0.2.6
   * momentjs v1.1.1
   * monitoring v1.79.0

plugins.conf

@@ -90,6 +90,7 @@
   matrix-project:1.14
   maven-plugin:3.4
   mercurial:2.8
+  mesos:1.0.0
   metrics:4.0.2.6
   momentjs:1.1.1
   monitoring:1.79.0

scripts/run.sh

@@ -9,6 +9,10 @@ export MESOS_NATIVE_JAVA_LIBRARY=$(ls /libmesos-bundle/lib/libmesos-*.so)
 /usr/local/jenkins/bin/bootstrap.py
 . /usr/local/jenkins/bin/dcos-account.sh
 
+# Remove any previous jenkins-mesos-plugin builds directly injected into the build path.
+# This was done in versions 3.5.4-2.150.1 and prior, this practice is now deprecated.
+rm -f  /var/jenkins_home/plugins/mesos.hpi
+
 nginx -c /var/nginx/nginx.conf    \
   && java ${JVM_OPTS}                                \
      -Dhudson.model.DirectoryBrowserSupport.CSP="${JENKINS_CSP_OPTS}" \