Template out version possibilities for ghprb config file

playbooks/roles/jenkins_build/defaults/main.yml

@@ -123,7 +123,7 @@ build_jenkins_plugins_list:
     version: '0.15.2'
     group: 'org.jenkins-ci.plugins'
   - name: 'ghprb'
-    version: '1.22.4'
+    version: '1.30.1'
     group: 'org.jenkins-ci.plugins'
   - name: 'github'
     version: '1.14.0'
@@ -202,6 +202,7 @@ build_jenkins_plugins_list:
     group: 'org.jenkins-ci.plugins'
 
 # ghprb
+build_jenkins_ghprb_white_list_phrase: '.*[Aa]dd\W+to\W+whitelist.*'
 build_jenkins_ghprb_ok_phrase: '.*ok\W+to\W+test.*'
 build_jenkins_ghprb_retest_phrase: '.*jenkins\W+run\W+all.*'
 build_jenkins_ghprb_skip_phrase: '.*\[[Ss]kip\W+ci\].*'

playbooks/roles/jenkins_build/meta/main.yml

@@ -6,6 +6,7 @@ dependencies:
     jenkins_common_configuration_scripts: '{{ build_jenkins_configuration_scripts }}'
     jenkins_common_template_files: '{{ build_jenkins_template_files }}'
     jenkins_common_plugins_list: '{{ build_jenkins_plugins_list }}'
+    jenkins_common_ghprb_white_list_phrase: '{{ build_jenkins_ghprb_white_list_phrase }}'
     jenkins_common_ghprb_ok_phrase: '{{ build_jenkins_ghprb_ok_phrase }}'
     jenkins_common_ghprb_retest_phrase: '{{ build_jenkins_ghprb_retest_phrase }}'
     jenkins_common_ghprb_skip_phrase: '{{ build_jenkins_ghprb_skip_phrase }}'

playbooks/roles/jenkins_common/defaults/main.yml

@@ -97,12 +97,19 @@ jenkins_common_ghprb_results:
     MESSAGE: 'Test FAILed.'
   - STATUS: 'SUCCESS'
     MESSAGE: 'Test PASSed.'
-
-JENKINS_GHPRB_TOKEN: ''
 JENKINS_GHPRB_ADMIN_LIST: []
+
+# For versions >= 1.34.0
 JENKINS_GHPRB_BLACK_LIST: []
 JENKINS_GHPRB_WHITE_LIST: []
 
+# For versions < 1.23
+JENKINS_GHPRB_TOKEN: ''
+
+# For versions >= 1.23
+JENKINS_GHPRB_CREDENTIAL_ID: ''
+JENKINS_GHPRB_SHARED_SECRET: ''
+
 # credentials
 JENKINS_SECRET_FILES_LIST: []
 JENKINS_USERNAME_PASSWORD_LIST: []

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

 ---
 SERVER_API_URL: '{{ jenkins_common_ghprb_server }}'
-ACCESS_TOKEN: '{{ JENKINS_GHPRB_TOKEN }}'
 ADMIN_LIST:
 {% for admin in JENKINS_GHPRB_ADMIN_LIST %}
     - '{{ admin }}'
@@ -17,14 +16,6 @@ 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 }}'
@@ -34,3 +25,21 @@ RESULT_MESSAGES:
     - STATUS: '{{ message.STATUS }}'
       MESSAGE: '{{ message.MESSAGE }}'
 {% endfor %}
+# The following fields will only be used by certain versions.
+
+# >= 1.34.0
+BLACK_LIST_LABELS:
+{% for blacklist in JENKINS_GHPRB_BLACK_LIST %}
+    - '{{ blacklist }}'
+{% endfor %}
+WHITE_LIST_LABELS:
+{% for whitelist in JENKINS_GHPRB_WHITE_LIST %}
+    - '{{ whitelist }}'
+{% endfor %}
+
+# < 1.23
+ACCESS_TOKEN: '{{ JENKINS_GHPRB_TOKEN }}'
+
+# >= 1.23
+CREDENTIALS_ID: '{{ JENKINS_GHPRB_CREDENTIAL_ID }}'
+SHARED_SECRET: '{{ JENKINS_GHPRB_SHARED_SECRET }}'