Commit c4f63ac0 by Michael Youngstrom

Add vars from review

parent 9fae798c
...@@ -37,17 +37,22 @@ JENKINS_MAIN_GITHUB_OWNER_WHITELIST: '' ...@@ -37,17 +37,22 @@ JENKINS_MAIN_GITHUB_OWNER_WHITELIST: ''
# MAILER CONFIG DEFAULT SECRETS # MAILER CONFIG DEFAULT SECRETS
JENKINS_MAILER_SMTP_AUTH_USERNAME: '' JENKINS_MAILER_SMTP_AUTH_USERNAME: ''
JENKINS_MAILER_SMTP_AUTH_PASSWORD: '' JENKINS_MAILER_SMTP_AUTH_PASSWORD: ''
JENKINS_MAILER_REPLY_TO_ADDRESS: 'edx-platform-build <ci@edx.org>'
JENKINS_MAILER_DEFAULT_SUFFIX: '@edx.org'
# HIPCHAT CONFIG DEFAULT SECRETS # HIPCHAT CONFIG DEFAULT SECRETS
JENKINS_HIPCHAT_API_TOKEN: '' JENKINS_HIPCHAT_API_TOKEN: ''
# EC2 CONFIG DEFAULT SECRETS # EC2 CONFIG DEFAULT SECRETS
JENKINS_EC2_PRIVATE_KEY: '' JENKINS_EC2_PRIVATE_KEY: ''
JENKINS_EC2_REGION: ''
JENKINS_EC2_ACCESS_KEY_ID: '' JENKINS_EC2_ACCESS_KEY_ID: ''
JENKINS_EC2_SECRET_ACCESS_KEY: '' JENKINS_EC2_SECRET_ACCESS_KEY: ''
JENKINS_EC2_IAM_INSTANCE_PROFILE: '' JENKINS_EC2_IAM_INSTANCE_PROFILE: ''
# GIT CONFIG DEFAULT SECRET
JENKINS_GIT_EMAIL: 'jenkins@example.com'
# GHPRB_CONFIG DEFAULT SECRETS # GHPRB_CONFIG DEFAULT SECRETS
JENKINS_GHPRB_TOKEN: '' JENKINS_GHPRB_TOKEN: ''
JENKINS_GHPRB_ADMIN_LIST: [] JENKINS_GHPRB_ADMIN_LIST: []
......
...@@ -4,7 +4,7 @@ CLOUDS: ...@@ -4,7 +4,7 @@ CLOUDS:
ACCESS_KEY_ID: '{{ JENKINS_EC2_ACCESS_KEY_ID }}' ACCESS_KEY_ID: '{{ JENKINS_EC2_ACCESS_KEY_ID }}'
SECRET_ACCESS_KEY: '{{ JENKINS_EC2_SECRET_ACCESS_KEY }}' SECRET_ACCESS_KEY: '{{ JENKINS_EC2_SECRET_ACCESS_KEY }}'
USE_INSTANCE_PROFILE_FOR_CREDS: false USE_INSTANCE_PROFILE_FOR_CREDS: false
REGION: 'us-east-1' REGION: '{{ JENKINS_EC2_REGION }}'
EC2_PRIVATE_KEY_PATH: '{{ build_jenkins_config_path }}/ec2/id_rsa' EC2_PRIVATE_KEY_PATH: '{{ build_jenkins_config_path }}/ec2/id_rsa'
INSTANCE_CAP: '250' INSTANCE_CAP: '250'
AMIS: AMIS:
......
--- ---
NAME: 'jenkins' NAME: 'jenkins'
EMAIL: 'jenkins@edx.org' EMAIL: '{{ JENKINS_GIT_EMAIL }}'
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