Merge pull request #3784 from edx/jibsheet/jenkins-module-upgrades

matrix-auth was being overridden by Jenkins (down to 1.1)

playbooks/roles/tools_jenkins/defaults/main.yml

@@ -5,11 +5,10 @@ jenkins_tools_version: "1.651.3"
 jenkins_tools_plugins:
   - { name: "cloudbees-folder", version: "5.12" }
   - { name: "structs", version: "1.2" }
-  - { name: "job-dsl", version: "1.50" }
+  - { name: "job-dsl", version: "1.52" }
   - { name: "greenballs", version: "1.15" }
   - { name: "rebuild", version: "1.25" }
   - { name: "build-user-vars-plugin", version: "1.5" }
-  - { name: "matrix-auth", version: "1.4" }
   - { name: "mailer", version: "1.17" }
   - { name: "credentials", version: "2.1.4" }
   - { name: "ssh-credentials", version: "1.12" }
@@ -48,9 +47,22 @@ jenkins_tools_plugins:
   - { name: "credentials-binding", version: "1.9" }
   - { name: "envinject", version: "1.92.1" }
 
+# matrix-auth is now pinned to avoid Jenkins overriding
+# 1.3 and later requires icon-shim
+  - { name: "matrix-auth", version: "1.4" }
+  - { name: "icon-shim", version: "2.0.3" }
+
 # ec2 + dependencies, used by the android build workers + any additional workers we build
   - { name: "ec2", version: "1.36" }
   - { name: "node-iterator-api", version: "1.5" }
   - { name: "aws-java-sdk", version: "1.11.37" }
   - { name: "jackson2-api", version: "2.5.4" }
   - { name: "aws-credentials", version: "1.11" }
+
+jenkins_tools_bundled_plugins:
+  - 'matrix-auth'
+  - "credentials"
+  - "git"
+  - "pam-auth"
+  - "ssh-credentials"
+  - "ssh-slaves"

playbooks/roles/tools_jenkins/meta/main.yml

@@ -8,3 +8,4 @@ dependencies:
     jenkins_version: "{{ jenkins_tools_version }}"
     jenkins_deb_url: "http://pkg.jenkins-ci.org/debian-stable/binary/jenkins_{{ jenkins_version }}_all.deb"
     jenkins_custom_plugins: []
+    jenkins_bundled_plugins: "{{ jenkins_tools_bundled_plugins }}"