Commit e5a4da4b by Ben Patterson

Jenkins JVM configuration should be set on the playbook.

parent e3b261ed
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
COMMON_DATA_DIR: "/mnt" COMMON_DATA_DIR: "/mnt2"
COMMON_ENABLE_DATADOG: True COMMON_ENABLE_DATADOG: True
COMMON_ENABLE_SPLUNKFORWARDER: True COMMON_ENABLE_SPLUNKFORWARDER: True
jenkins_jvm_args: "-Djava.awt.headless=true -Xmx7168m -XX:MaxPermSize=512m"
SPLUNKFORWARDER_LOG_ITEMS: SPLUNKFORWARDER_LOG_ITEMS:
- source: '/var/lib/jenkins/jobs/*/builds/*/junitResult.xml' - source: '/var/lib/jenkins/jobs/*/builds/*/junitResult.xml'
......
...@@ -7,7 +7,8 @@ jenkins_port: 8080 ...@@ -7,7 +7,8 @@ jenkins_port: 8080
jenkins_version: "1.630" jenkins_version: "1.630"
jenkins_deb_url: "http://pkg.jenkins-ci.org/debian/binary/jenkins_{{ jenkins_version }}_all.deb" jenkins_deb_url: "http://pkg.jenkins-ci.org/debian/binary/jenkins_{{ jenkins_version }}_all.deb"
jenkins_deb: "jenkins_{{ jenkins_version }}_all.deb" jenkins_deb: "jenkins_{{ jenkins_version }}_all.deb"
jenkins_jvm_args: "-Djava.awt.headless=true -Xmx6144m" # Jenkins jvm args are set when starting the Jenkins service, e.g., "-Xmx1024m"
jenkins_jvm_args: ""
jenkins_plugins: jenkins_plugins:
- { name: "build-name-setter", version: "1.3" } - { name: "build-name-setter", version: "1.3" }
......
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
service: name=jenkins state=stopped service: name=jenkins state=stopped
- name: set jvm args - name: set jvm args
lineinfile: > lineinfile:
backup=yes backup: yes
dest=/etc/default/jenkins dest: /etc/default/jenkins
regexp='^JAVA_ARGS' regexp: '^JAVA_ARGS'
line='JAVA_ARGS=\"{{ jenkins_jvm_args }}\"' line: 'JAVA_ARGS=\"{{ jenkins_jvm_args }}\"'
notify: notify:
- restart Jenkins - restart Jenkins
tags: tags:
......
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