Merge pull request #4111 from edx/youngstrom/ghprb_versions

Reverting ghprb versioning in template file

playbooks/edx-east/jenkins_build.yml

@@ -16,6 +16,7 @@
       build_jenkins_configuration_scripts:
         - 1addJarsToClasspath.groovy
         - 2checkInstalledPlugins.groovy
+        - 3importCredentials.groovy
         - 3mainConfiguration.groovy
         - 3shutdownCLI.groovy
         - 4configureEc2Plugin.groovy
@@ -26,4 +27,3 @@
         - 4configureJobConfigHistory.groovy
         - 4configureMailerPlugin.groovy
         - 5createLoggers.groovy
-        - 6importCredentials.groovy

playbooks/roles/jenkins_build/defaults/main.yml

@@ -2,6 +2,7 @@ build_jenkins_version: jenkins_1.651.3
 build_jenkins_configuration_scripts:
   - 1addJarsToClasspath.groovy
   - 2checkInstalledPlugins.groovy
+  - 3importCredentials.groovy
   - 3mainConfiguration.groovy
   - 3setGlobalProperties.groovy
   - 3shutdownCLI.groovy
@@ -14,7 +15,6 @@ build_jenkins_configuration_scripts:
   - 4configureMailerPlugin.groovy
   - 5addSeedJob.groovy
   - 5createLoggers.groovy
-  - 6importCredentials.groovy
 
 # plugins
 build_jenkins_plugins_list:

playbooks/roles/jenkins_common/defaults/main.yml

@@ -103,15 +103,6 @@ jenkins_common_ghprb_results:
   - STATUS: 'SUCCESS'
     MESSAGE: 'Test PASSed.'
 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: ''
 

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

@@ -25,21 +25,5 @@ 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 }}'