Commit e3b261ed by Ben Patterson

Use Java 7 with custom ARGS.

parent f5134954
...@@ -7,6 +7,7 @@ jenkins_port: 8080 ...@@ -7,6 +7,7 @@ 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_plugins: jenkins_plugins:
- { name: "build-name-setter", version: "1.3" } - { name: "build-name-setter", version: "1.3" }
......
--- ---
dependencies: dependencies:
- common - common
- oraclejdk - role: oraclejdk
tags: java
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
- name: install jenkins extra system packages - name: install jenkins extra system packages
apt: apt:
pkg={{','.join(JENKINS_EXTRA_PKGS)}} pkg={{ item }} state=present update_cache=yes
state=present update_cache=yes with_items: JENKINS_EXTRA_PKGS
tags: tags:
- jenkins - jenkins
...@@ -38,6 +38,18 @@ ...@@ -38,6 +38,18 @@
- name: stop Jenkins - name: stop Jenkins
service: name=jenkins state=stopped service: name=jenkins state=stopped
- name: set jvm args
lineinfile: >
backup=yes
dest=/etc/default/jenkins
regexp='^JAVA_ARGS'
line='JAVA_ARGS=\"{{ jenkins_jvm_args }}\"'
notify:
- restart Jenkins
tags:
- java
- jenkins
# Move /var/lib/jenkins to Jenkins home (on the EBS) # Move /var/lib/jenkins to Jenkins home (on the EBS)
- name: move /var/lib/jenkins - name: move /var/lib/jenkins
command: mv /var/lib/jenkins {{ jenkins_home }} command: mv /var/lib/jenkins {{ jenkins_home }}
......
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