Merge pull request #3294 from edx/jibsheet/update-tools-jenkins-plugins

Upgrade tools jenkins and plugins

playbooks/edx-east/jenkins_tools.yml

@@ -8,6 +8,10 @@
   serial: "{{ serial_count }}"
   roles:
     - aws
+    # jenkins_master role does extra tweaks to datadog if COMMON_ENABLE_DATADOG is set
+    # so this needs to run early.
+    - role: datadog
+      when: COMMON_ENABLE_DATADOG
     - tools_jenkins
     # This requires an override of the following form:
     # SPLUNKFORWARDER_LOG_ITEMS:
@@ -18,3 +22,5 @@
     #     crcSalt: <SOURCE>
     - role: splunkforwarder
       when: COMMON_ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: COMMON_ENABLE_NEWRELIC

playbooks/roles/tools_jenkins/defaults/main.yml

 ---
-jenkins_tools_version: "1.646"
+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: "greenballs", version: "1.15" }
   - { name: "rebuild", version: "1.25" }
   - { name: "build-user-vars-plugin", version: "1.5" }
-  - { name: "matrix-auth", version: "1.2" }
-  - { name: "matrix-project", version: "1.6" }
-  - { name: "mailer", version: "1.16" }
-  - { name: "credentials", version: "1.24" }
-  - { name: "ssh-credentials", version: "1.11" }
-  - { name: "ssh-agent", version: "1.9" }
+  - { name: "matrix-auth", version: "1.4" }
+  - { name: "mailer", version: "1.17" }
+  - { name: "credentials", version: "2.1.4" }
+  - { name: "ssh-credentials", version: "1.12" }
+  - { name: "ssh-agent", version: "1.13" }
+  - { name: "bouncycastle-api", version: "1.648.3" }
   - { name: "token-macro", version: "1.12.1" }
-  - { name: "parameterized-trigger", version: "2.30" }
-  - { name: "multiple-scms", version: "0.5" }
-  - { name: "copy-project-link", version: "1.5" }
-  - { name: "scriptler", version: "2.9" }
-  - { name: "ssh-slaves", version: "1.10" }
-  - { name: "translation", version: "1.12" }
-  - { name: "dynamicparameter", version: "0.2.0" }
+  - { name: "parameterized-trigger", version: "2.32" }
+  - { name: "conditional-buildstep", version: "1.3.5" }
+  - { name: "run-condition", version: "0.10" }
+  - { name: "multiple-scms", version: "0.6" }
   - { name: "hipchat", version: "1.0.0" }
-  - { name: "throttle-concurrents", version: "1.8.4" }
+  - { name: "throttle-concurrents", version: "1.9.0" }
   - { name: "mask-passwords", version: "2.8" }
-  - { name: "jquery", version: "1.11.2-0" }
-  - { name: "dashboard-view", version: "2.9.7" }
-  - { name: "s3", version: "0.8" }
+  - { name: "dashboard-view", version: "2.9.10" }
   - { name: "tmpcleaner", version: "1.2" }
-  - { name: "jobConfigHistory", version: "2.12" }
-  - { name: "build-timeout", version: "1.15.1" }
-  - { name: "next-build-number", version: "1.1" }
-  - { name: "nested-view", version: "1.14" }
-  - { name: "timestamper", version: "1.7.3" } 
+  - { name: "jobConfigHistory", version: "2.15" }
+  - { name: "build-timeout", version: "1.17.1" }
+  - { name: "timestamper", version: "1.8.4" } 
   - { name: "postbuild-task", version: "1.8" }
   - { name: "notification", version: "1.10" }
-  - { name: "copy-to-slave", version: "1.4.4" }
-  - { name: "copyartifact", version: "1.37" }
-  - { name: "shiningpanda", version: "0.22" }
-  - { name: "htmlpublisher", version: "1.10" }
-  - { name: "build-name-setter", version: "1.5.1" }
-  - { name: "simple-parameterized-builds-report", version: "1.4" }
-  - { name: "junit", version: "1.10" }
-  - { name: "scm-api", version: "1.0" }
-  - { name: "github-api", version: "1.71" }
-  - { name: "git-client", version: "1.19.1"}
-  - { name: "git", version: "2.4.1"}
-  - { name: "github", version: "1.16.0" } 
-  - { name: "github-oauth", version: "0.22.2" }
+  - { name: "shiningpanda", version: "0.23" }
+  - { name: "build-name-setter", version: "1.6.5" }
+  - { name: "simple-parameterized-builds-report", version: "1.5" }
+  - { name: "junit", version: "1.15" }
+  - { name: "scm-api", version: "1.2" }
+  - { name: "workflow-scm-step", version: "1.14.2" }
+  - { name: "workflow-step-api", version: "1.14.2" }
+  - { name: "github-api", version: "1.77" }
+  - { name: "git-client", version: "1.21.0"}
+  - { name: "git", version: "2.5.3"}
+  - { name: "github", version: "1.21.1" }
+  - { name: "plain-credentials", version: "1.2" }
+  - { name: "github-oauth", version: "0.24" }

playbooks/roles/tools_jenkins/meta/main.yml

@@ -5,3 +5,4 @@ dependencies:
   - role: jenkins_master
     jenkins_plugins: "{{ jenkins_tools_plugins }}"
     jenkins_version: "{{ jenkins_tools_version }}"
+    jenkins_deb_url: "http://pkg.jenkins-ci.org/debian-stable/binary/jenkins_{{ jenkins_version }}_all.deb"

playbooks/roles/tools_jenkins/tasks/main.yml

@@ -2,6 +2,7 @@
 - name: Get the list of hpi files
   shell: "ls {{ jenkins_home }}/plugins/*.hpi"
   register: hpi_files
+  ignore_errors: true
 
 - name: Set the permission on hpi files
   file: 
@@ -10,6 +11,7 @@
     group: "{{ jenkins_group }}"
     mode: 0644
   with_items: hpi_files.stdout_lines
+  when: hpi_files
   notify:
     - restart Jenkins