Commit 1dc00c73 by Stu Young Committed by GitHub

Merge pull request #4134 from edx/estute/configure-jenkins-gh-plugin

add generic config for github plugin
parents 0677092e 542f2e99
...@@ -11,6 +11,7 @@ build_jenkins_configuration_scripts: ...@@ -11,6 +11,7 @@ build_jenkins_configuration_scripts:
- 4configureGHOAuth.groovy - 4configureGHOAuth.groovy
- 4configureGHPRB.groovy - 4configureGHPRB.groovy
- 4configureGit.groovy - 4configureGit.groovy
- 4configureGithub.groovy
- 4configureHipChat.groovy - 4configureHipChat.groovy
- 4configureJobConfigHistory.groovy - 4configureJobConfigHistory.groovy
- 4configureMailerPlugin.groovy - 4configureMailerPlugin.groovy
...@@ -210,6 +211,9 @@ build_jenkins_ghprb_retest_phrase: '.*jenkins\W+run\W+all.*' ...@@ -210,6 +211,9 @@ build_jenkins_ghprb_retest_phrase: '.*jenkins\W+run\W+all.*'
build_jenkins_ghprb_skip_phrase: '.*\[[Ss]kip\W+ci\].*' build_jenkins_ghprb_skip_phrase: '.*\[[Ss]kip\W+ci\].*'
build_jenkins_ghprb_cron_schedule: 'H/5 * * * *' build_jenkins_ghprb_cron_schedule: 'H/5 * * * *'
# github
JENKINS_GITHUB_CONFIG: ''
# hipchat # hipchat
build_jenkins_hipchat_room: 'testeng' build_jenkins_hipchat_room: 'testeng'
......
...@@ -12,6 +12,7 @@ dependencies: ...@@ -12,6 +12,7 @@ dependencies:
jenkins_common_ghprb_retest_phrase: '{{ build_jenkins_ghprb_retest_phrase }}' jenkins_common_ghprb_retest_phrase: '{{ build_jenkins_ghprb_retest_phrase }}'
jenkins_common_ghprb_skip_phrase: '{{ build_jenkins_ghprb_skip_phrase }}' jenkins_common_ghprb_skip_phrase: '{{ build_jenkins_ghprb_skip_phrase }}'
jenkins_common_ghprb_cron_schedule: '{{ build_jenkins_ghprb_cron_schedule }}' jenkins_common_ghprb_cron_schedule: '{{ build_jenkins_ghprb_cron_schedule }}'
jenkins_common_github_configs: '{{ JENKINS_GITHUB_CONFIG }}'
jenkins_common_hipchat_room: '{{ build_jenkins_hipchat_room }}' jenkins_common_hipchat_room: '{{ build_jenkins_hipchat_room }}'
jenkins_common_instance_cap: '{{ build_jenkins_instance_cap }}' jenkins_common_instance_cap: '{{ build_jenkins_instance_cap }}'
jenkins_common_seed_name: '{{ build_jenkins_seed_name }}' jenkins_common_seed_name: '{{ build_jenkins_seed_name }}'
......
...@@ -29,6 +29,7 @@ jenkins_common_non_plugin_template_files: ...@@ -29,6 +29,7 @@ jenkins_common_non_plugin_template_files:
- ec2_config - ec2_config
- ghprb_config - ghprb_config
- git_config - git_config
- github_config
- hipchat_config - hipchat_config
- job_config_history - job_config_history
- log_config - log_config
...@@ -128,6 +129,14 @@ JENKINS_SECURITY_GROUPS: [] ...@@ -128,6 +129,14 @@ JENKINS_SECURITY_GROUPS: []
JENKINS_GIT_NAME: 'jenkins' JENKINS_GIT_NAME: 'jenkins'
JENKINS_GIT_EMAIL: 'jenkins@example.com' JENKINS_GIT_EMAIL: 'jenkins@example.com'
# github
jenkins_common_github_configs:
- CREDENTIAL_ID: ''
MANAGE_HOOKS: false
USE_CUSTOM_API_URL: false
GITHUB_API_URL: ''
CACHE_SIZE: 20
# hipchat # hipchat
jenkins_common_hipchat_room: '' jenkins_common_hipchat_room: ''
JENKINS_HIPCHAT_API_TOKEN: '' JENKINS_HIPCHAT_API_TOKEN: ''
......
---
{% for config in jenkins_common_github_configs %}
- CREDENTIAL_ID: '{{ config.GITHUB_CREDENTIAL_ID }}'
MANAGE_HOOKS: '{{ config.GITHUB_MANAGE_HOOKS }}'
USE_CUSTOM_API_URL: '{{ config.GITHUB_USE_CUSTOM_API_URL }}'
API_URL: '{{ config.GITHUB_API_URL }}'
CACHE_SIZE: '{{ config.GITHUB_CACHE_SIZE}}'
{% endfor %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment