Skip to content

Commit d5d971f

Browse files
nre-abletonemmetog
authored andcommitted
Use Java 8 when installing Jenkins (#10)
* Create Jenkins home directory when creating user Note: This change means that the Jenkins home directory will have a mode of 0755 instead of 0777, as it was before. * Use /bin/false for the Jenkins user's shell * Move Java version to variable for apt installation This change allows the user to specify a list of apt packages and a specific Java version to use on the Jenkins master instance. As of Jenkins 2.54, Java 8 is required. For more information, see: https://jenkins.io/blog/2017/04/10/jenkins-has-upgraded-to-java-8/
1 parent e646454 commit d5d971f

File tree

3 files changed

+29
-14
lines changed

3 files changed

+29
-14
lines changed

README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,19 @@ jenkins_docker_container_name: jenkins
9696
jenkins_docker_expose_port: true
9797
```
9898
99+
Debian-Specific Role Variables
100+
------------------------------
101+
102+
```yml
103+
# Packages which are to be installed on the jenkins instance
104+
jenkins_apt_packages:
105+
- openjdk-8-jdk
106+
107+
# Java version to use. Note that JDK 8 is required for Jenkins
108+
# 2.54 or greater.
109+
jenkins_java_version: "java-1.8.0-openjdk-amd64"
110+
```
111+
99112
Example Playbook
100113
----------------
101114

tasks/apt/install.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
---
22

3+
- name: Include Debian-specific variables
4+
include_vars: "debian.yml"
5+
36
- name: Create Jenkins group
47
group:
58
name: "{{ jenkins_config_group }}"
@@ -9,16 +12,10 @@
912
user:
1013
name: "{{ jenkins_config_owner }}"
1114
group: "{{ jenkins_config_group }}"
15+
home: "{{ jenkins_home }}"
16+
shell: "/bin/false"
1217
state: present
1318

14-
- name: Ensure jenkins home dir is created
15-
file:
16-
path: "{{ jenkins_home }}"
17-
mode: 0777
18-
owner: "{{ jenkins_config_owner }}"
19-
group: "{{ jenkins_config_group }}"
20-
state: directory
21-
2219
- name: Install apt PPA dependencies
2320
apt:
2421
name: python-software-properties
@@ -45,13 +42,12 @@
4542
group: root
4643
mode: 0644
4744

48-
- name: Install OpenJDK 7
49-
apt:
50-
name: openjdk-7-jdk
51-
update_cache: yes
45+
- name: Install apt packages
46+
action: apt name={{ item }} state=present
47+
with_items: "{{ jenkins_apt_packages }}"
5248

53-
- name: Update java alternatives
54-
shell: /usr/sbin/update-java-alternatives -s java-1.7.0-openjdk-amd64
49+
- name: Set default Java version
50+
shell: /usr/sbin/update-java-alternatives -s "{{ jenkins_java_version }}"
5551
ignore_errors: yes
5652

5753
- name: Add Jenkins key

vars/debian.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
3+
jenkins_apt_packages:
4+
- openjdk-8-jdk
5+
6+
jenkins_java_version: "java-1.8.0-openjdk-amd64"

0 commit comments

Comments
 (0)