Merge pull request #4117 from edx/youngstrom/2x

Changes to support Jenkins 2x in jenkins_build

playbooks/roles/jenkins_build/defaults/main.yml

 build_jenkins_user_uid: 1002
 build_jenkins_group_gid: 1004
-build_jenkins_version: jenkins_1.651.3
+build_jenkins_version: jenkins_2.60.3
 build_jenkins_jvm_args: '-Djava.awt.headless=true -Xmx8192m'
 build_jenkins_configuration_scripts:
   - 1addJarsToClasspath.groovy
@@ -47,10 +47,10 @@ build_jenkins_plugins_list:
     version: '1.2'
     group: 'org.jenkins-ci.plugins'
   - name: 'matrix-project'
-    version: '1.4.1'
+    version: '1.7'
     group: 'org.jenkins-ci.plugins'
   - name: 'credentials'
-    version: '1.24'
+    version: '2.1.8'
     group: 'org.jenkins-ci.plugins'
   - name: 'ssh-credentials'
     version: '1.11'
@@ -62,7 +62,7 @@ build_jenkins_plugins_list:
     version: '1.12'
     group: 'org.jenkins-ci.plugins'
   - name: 'subversion'
-    version: '2.4.5'
+    version: '2.5'
     group: 'org.jenkins-ci.plugins'
   - name: 'junit'
     version: '1.3'
@@ -74,7 +74,7 @@ build_jenkins_plugins_list:
     version: '2.8'
     group: 'org.jenkins-ci.main'
   - name: 'ssh-slaves'
-    version: '1.9'
+    version: '1.20'
     group: 'org.jenkins-ci.plugins'
   - name: 'javadoc'
     version: '1.3'
@@ -83,7 +83,7 @@ build_jenkins_plugins_list:
     version: '0.4.1'
     group: 'org.jenkins-ci.plugins'
   - name: 'bouncycastle-api'
-    version: '1.0.3'
+    version: '2.16.0'
     group: 'org.jenkins-ci.plugins'
   - name: 'build-flow-plugin'
     version: '0.17'
@@ -119,7 +119,7 @@ build_jenkins_plugins_list:
     version: '1.28'
     group: 'org.jenkins-ci.plugins'
   - name: 'envinject'
-    version: '1.92.1'
+    version: '2.0'
     group: 'org.jenkins-ci.plugins'
   - name: 'exclusive-execution'
     version: '0.8'
@@ -128,10 +128,10 @@ build_jenkins_plugins_list:
     version: '0.15.2'
     group: 'org.jenkins-ci.plugins'
   - name: 'ghprb'
-    version: '1.30.1'
+    version: '1.36.0'
     group: 'org.jenkins-ci.plugins'
   - name: 'github'
-    version: '1.14.0'
+    version: '1.26.0'
     group: 'com.coravy.hudson.plugins.github'
   - name: 'github-oauth'
     version: '0.24'
@@ -140,7 +140,7 @@ build_jenkins_plugins_list:
     version: '1.24'
     group: 'org.jenkins-ci.plugins'
   - name: 'groovy'
-    version: '1.29'
+    version: '2.0'
     group: 'org.jenkins-ci.plugins'
   - name: 'groovy-postbuild'
     version: '2.2'
@@ -188,7 +188,7 @@ build_jenkins_plugins_list:
     version: '0.21'
     group: 'org.jenkins-ci.plugins'
   - name: 'ssh-agent'
-    version: '1.5'
+    version: '1.14'
     group: 'org.jenkins-ci.plugins'
   - name: 'text-finder'
     version: '1.10'

playbooks/roles/jenkins_common/templates/config/ghprb_config.yml.j2

@@ -16,6 +16,14 @@ MANAGE_WEBHOOKS:  {{ jenkins_common_ghprb_manage_webhooks }}
 UNSTABLE_AS: '{{ jenkins_common_ghprb_failure_as }}'
 AUTO_CLOSE_FAILED_PRS: {{ jenkins_common_ghprb_auto_close_fails }}
 DISPLAY_ERRORS_DOWNSTREAM: {{ jenkins_commmon_ghprb_display_errors }}
+BLACK_LIST_LABELS:
+{% for blacklist in JENKINS_GHPRB_BLACK_LIST %}
+    - '{{ blacklist }}'
+{% endfor %}
+WHITE_LIST_LABELS:
+{% for whitelist in JENKINS_GHPRB_WHITE_LIST %}
+    - '{{ whitelist }}'
+{% endfor %}
 GITHUB_AUTH: '{{ jenkins_common_ghprb_github_auth }}'
 SIMPLE_STATUS: '{{ jenkins_common_ghprb_simple_status }}'
 PUBLISH_JENKINS_URL: '{{ jenkins_common_ghprb_publish_jenkins_url }}'