Commit 898b3afb by Michael Youngstrom

fix variables between common and build jenkins

parent dfc81db1
build_jenkins_user: jenkins build_jenkins_user: jenkins
build_jenkins_version: jenkins_1.651.3
build_jenkins_war_source: https://s3.amazonaws.com/edx-testeng-tools/jenkins
build_jenkins_server_name: build.testeng.edx.org build_jenkins_server_name: build.testeng.edx.org
build_jenkins_git_home: /git build_jenkins_git_home: /git
build_jenkins_debian_pkgs:
- git
- curl
- nginx
- maven
- daemon
- psmisc
build_jenkins_home: /var/lib/jenkins build_jenkins_home: /var/lib/jenkins
build_jenkins_config_path: /init-configs build_jenkins_config_path: /init-configs
...@@ -45,7 +34,7 @@ JENKINS_HIPCHAT_API_TOKEN: '' ...@@ -45,7 +34,7 @@ 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_REGION: 'us-east-1'
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: ''
......
...@@ -4,15 +4,7 @@ dependencies: ...@@ -4,15 +4,7 @@ dependencies:
- edxapp_common - edxapp_common
- browsers - browsers
- role: jenkins_common - role: jenkins_common
jenkins_common_user: '{{ build_jenkins_user }}'
jenkins_common_version: '{{ build_jenkins_version }}'
jenkins_common_war_source: '{{ build_jenkins_war_source }}'
jenkins_common_debian_pkgs: '{{ build_jenkins_debian_pkgs }}'
jenkins_common_home: '{{ build_jenkins_home }}'
jenkins_common_git_home: '{{ build_jenkins_git_home }}'
jenkins_common_config_path: '{{ build_jenkins_config_path }}'
jenkins_common_configuration_scripts: '{{ build_jenkins_configuration_scripts }}' jenkins_common_configuration_scripts: '{{ build_jenkins_configuration_scripts }}'
jenkins_common_plugins: '{{ build_jenkins_plugins }}'
jenkins_common_server_name: '{{ build_jenkins_server_name }}' jenkins_common_server_name: '{{ build_jenkins_server_name }}'
- role: docker-tools - role: docker-tools
......
...@@ -3,10 +3,8 @@ jenkins_common_group: edx ...@@ -3,10 +3,8 @@ jenkins_common_group: edx
jenkins_common_home: /var/lib/jenkins jenkins_common_home: /var/lib/jenkins
jenkins_common_config_path: /init-configs jenkins_common_config_path: /init-configs
jenkins_common_port: 8080 jenkins_common_port: 8080
jenkins_common_version: jenkins_1.651.3
jenkins_common_version: jenkins_common_1.651.3
jenkins_common_war_source: https://s3.amazonaws.com/edx-testeng-tools/jenkins jenkins_common_war_source: https://s3.amazonaws.com/edx-testeng-tools/jenkins
jenkins_common_nginx_port: 80 jenkins_common_nginx_port: 80
jenkins_common_protocol_https: true jenkins_common_protocol_https: true
jenkins_common_server_name: jenkins.testeng.edx.org jenkins_common_server_name: jenkins.testeng.edx.org
......
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