Update Jenkins to 2.60.3
The Jenkins version was still at 2.25.
In the process of updating to the current LTS, this change updates
Jenkins to 2.60.3, which is the last version supporting the build
flow plugin, while supporting pipelines. This version can be used
to convert build flow jobs to pipeline jobs, before updating
further.
Change-Id: I89cfad6e0b5edfb8cdde1f2b3cd342c4de9bddc7
diff --git a/jenkins-docker/master/Dockerfile b/jenkins-docker/master/Dockerfile
index fb2b526..9945444 100644
--- a/jenkins-docker/master/Dockerfile
+++ b/jenkins-docker/master/Dockerfile
@@ -2,8 +2,8 @@
USER root
-ARG JENKINS_WAR_VER=2.15
-ARG JENKINS_WAR_SHA=9d9c237c4a573f415679f36421de7c0b57fc2d3e
+ARG JENKINS_WAR_VER=2.60.3
+ARG JENKINS_WAR_SHA=e62d9ed7eb3d29b08719e639c959cd328776ba50
# could use ADD but this one does not check Last-Modified header
# see https://github.com/docker/docker/issues/8331
diff --git a/jenkins-docker/master/Makefile b/jenkins-docker/master/Makefile
index 35d49c8..d2575a1 100644
--- a/jenkins-docker/master/Makefile
+++ b/jenkins-docker/master/Makefile
@@ -6,8 +6,8 @@
OAUTH_SECRET=secret
JENKINS_API_USER=user
JENKINS_API_PASSWORD=pass
-JENKINS_WAR_VER=2.25
-JENKINS_WAR_SHA=1c4a750b7d7102c5fc9b78550fd3dcc93d7374da
+JENKINS_WAR_VER=2.60.3
+JENKINS_WAR_SHA=e62d9ed7eb3d29b08719e639c959cd328776ba50
IMAGE=${ORGANISATION}/${NAME}:${JENKINS_WAR_VER}
# Targets
diff --git a/jenkins-docker/master/edit-config.xslt b/jenkins-docker/master/edit-config.xslt
index d1edd26..2539536 100644
--- a/jenkins-docker/master/edit-config.xslt
+++ b/jenkins-docker/master/edit-config.xslt
@@ -27,6 +27,7 @@
<xsl:element name="githubApiUri">https://api.github.com</xsl:element>
<xsl:element name="clientId"><xsl:value-of select="$oauth-client-id"/></xsl:element>
<xsl:element name="clientSecret"><xsl:value-of select="$oauth-client-secret"/></xsl:element>
+ <xsl:element name="oauthScopes">read:org,user:email</xsl:element>
</xsl:element>
</xsl:template>
diff --git a/jenkins-docker/master/plugins.txt b/jenkins-docker/master/plugins.txt
index 6584082..aac1ba5 100644
--- a/jenkins-docker/master/plugins.txt
+++ b/jenkins-docker/master/plugins.txt
@@ -1,61 +1,58 @@
ace-editor:1.1
-antisamy-markup-formatter:1.3
-branch-api:1.8
-build-flow-plugin:0.19
-build-timeout:1.16
-cloudbees-folder:5.11
+antisamy-markup-formatter:1.5
+branch-api:2.0.20
+build-flow-plugin:0.20
+build-timeout:1.19
+cloudbees-folder:6.4
credentials:2.1.16
-docker-commons:1.11
-docker-java-api:3.0.14
-docker-plugin:1.0.4
-durable-task:1.10
+docker-plugin:1.1.4
+durable-task:1.22
embeddable-build-status:1.9
-envinject:1.92.1
-git:2.4.4
-git-client:1.19.6
-github:1.19.1
-github-api:1.75
-github-branch-source:1.7
-github-oauth:0.24
-github-organization-folder:1.3
-git-server:1.6
+envinject:2.1.5
+git:3.9.1
+git-client:2.7.2
+github:1.29.1
+github-api:1.92
+github-branch-source:2.3.6
+github-oauth:0.29
+github-organization-folder:1.6
+git-server:1.7
greenballs:1.15
-groovy-postbuild:2.3.1
+groovy-postbuild:2.4.1
handlebars:1.1.1
-logstash:1.2.0
+logstash:2.0.0
icon-shim:2.0.3
-jackson2-api:2.7.3
jquery-detached:1.2.1
-junit:1.13
-mailer:1.20
-mask-passwords:2.8
-matrix-auth:1.4
-matrix-project:1.7
+junit:1.24
+mailer:1.21
+mask-passwords:2.12.0
+matrix-auth:2.2
+matrix-project:1.13
momentjs:1.1.1
-monitoring:1.60.0
-pipeline-build-step:2.0
-pipeline-input-step:2.0
-pipeline-rest-api:1.4
-pipeline-stage-step:2.1
-pipeline-stage-view:1.4
+monitoring:1.73.0
+pipeline-build-step:2.7
+pipeline-input-step:2.8
+pipeline-rest-api:2.10
+pipeline-stage-step:2.3
+pipeline-stage-view:2.10
plain-credentials:1.4
-scm-api:1.2
-script-security:1.19
-ssh-credentials:1.12
-ssh-slaves:1.11
+scm-api:2.2.7
+script-security:1.44
+ssh-credentials:1.13
+ssh-slaves:1.26
structs:1.14
-token-macro:1.12.1
-timestamper:1.8.2
-windows-slaves:1.1
-workflow-aggregator:2.1
-workflow-api:2.0
-workflow-basic-steps:2.0
-workflow-cps:2.4
-workflow-cps-global-lib:2.0
-workflow-durable-task-step:2.0
-workflow-job:2.2
-workflow-multibranch:2.4
-workflow-scm-step:2.0
-workflow-step-api:2.14
-workflow-support:2.0
-xvfb:1.1.3
\ No newline at end of file
+token-macro:2.5
+timestamper:1.8.10
+windows-slaves:1.3.1
+workflow-aggregator:2.5
+workflow-api:2.27
+workflow-basic-steps:2.8
+workflow-cps:2.45
+workflow-cps-global-lib:2.9
+workflow-durable-task-step:2.19
+workflow-job:2.12.2
+workflow-multibranch:2.16
+workflow-scm-step:2.6
+workflow-step-api:2.15
+workflow-support:2.18
+xvfb:1.1.3
diff --git a/jenkins/gerrit-ci-scripts.yaml b/jenkins/gerrit-ci-scripts.yaml
index daf6906..b57e2af 100644
--- a/jenkins/gerrit-ci-scripts.yaml
+++ b/jenkins/gerrit-ci-scripts.yaml
@@ -29,8 +29,8 @@
builders:
- shell: docker system prune -af
- shell: |
- export JENKINS_WAR_VER=2.25
- export JENKINS_WAR_SHA=1c4a750b7d7102c5fc9b78550fd3dcc93d7374da
+ export JENKINS_WAR_VER=2.60.3
+ export JENKINS_WAR_SHA=e62d9ed7eb3d29b08719e639c959cd328776ba50
cd jenkins-docker
make NO_CACHE=true build
