Skip to content

Commit

Permalink
Add Java 8
Browse files Browse the repository at this point in the history
Jenkins, since version 2.60 requires Java 8,
for Ubuntu 14.04 (the one used still on Jenkins master) there is some more work involved.
  • Loading branch information
gforcada committed Jul 22, 2017
1 parent 38f8b57 commit 60545ee
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 2 deletions.
25 changes: 25 additions & 0 deletions ansible/server.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,31 @@
---
# Jenkins server for Plone CI testing

# TODO(gforcada) remove it as soon as jenkins master is on Ubuntu 16.04
- hosts: jenkins.plone.org
remote_user: root
tasks:
- name: Install repository for Java 8 in Ubuntu
become: yes
apt_repository: repo='ppa:openjdk-r/ppa'

- name: Update
become: yes
apt:
update_cache=yes

- name: Install Java 8
become: yes
apt:
name=openjdk-8-jdk
state=installed

- name: Fix java version selected
become: yes
alternatives:
name: java
path: /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java

- hosts: jenkins.plone.org
remote_user: root
roles:
Expand Down
27 changes: 25 additions & 2 deletions ansible/vagrant/playbook.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
---
# Jenkins server to test jenkins.plone.org locally with vagrant

# TODO(gforcada) remove it as soon as jenkins master is on Ubuntu 16.04
- hosts: master
tasks:
- name: Install repository for Java 8 in Ubuntu
become: yes
apt_repository: repo='ppa:openjdk-r/ppa'
- name: Update
become: yes
apt:
update_cache=yes
- name: Install Java 8
become: yes
apt:
name=openjdk-8-jdk
state=installed
- name: Fix java version selected
become: yes
alternatives:
name: java
path: /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java

- hosts: master
remote_user: vagrant
become: yes
Expand All @@ -18,8 +39,10 @@
github_orgs:
- plone
- collective
node_names:
- node
nodes_info:
- name: node
host: "127.0.0.1"
port: "8085"
python_26: true
pillow: true
lxml: true
Expand Down

0 comments on commit 60545ee

Please sign in to comment.