Skip to content

Commit

Permalink
ubuntu 14.04 ppcle64
Browse files Browse the repository at this point in the history
PR-URL: #1075
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
  • Loading branch information
jBarz authored and mhdawson committed Feb 9, 2018
1 parent 1f63cbd commit 443f72e
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 5 deletions.
1 change: 1 addition & 0 deletions ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ hosts:
ubuntu1404-ppc64_be-2: {ip: 140.211.168.75}
ubuntu1404-ppc64_le-1: {ip: 140.211.168.106}
ubuntu1404-ppc64_le-2: {ip: 140.211.168.94}
ubuntu1404-ppc64_le-3: {ip: 140.211.168.221, user: root}

- rackspace:
centos7-x64-1: {ip: 119.9.27.82}
Expand Down
2 changes: 2 additions & 0 deletions ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ packages: {

ubuntu1404: [
'ntp',
'g++-4.8',
'gcc-4.8',
'g++-4.9',
'gcc-4.9',
]
Expand Down
25 changes: 20 additions & 5 deletions ansible/roles/java-base/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#

- name: install add-apt-repostory
when: os in ("ubuntu1204", "ubuntu1404")
when: os in ("ubuntu1204", "ubuntu1404") and arch != "ppc64"
package: name=software-properties-common state=present

- name: add webupd8 oracle java repository
when: os in ("ubuntu1204", "ubuntu1404")
when: os in ("ubuntu1204", "ubuntu1404") and arch != "ppc64"
apt_repository: repo='ppa:webupd8team/java'

- name: add webupd8team oracle java repository
Expand All @@ -24,21 +24,36 @@
shell: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886

- name: accept webupd8 oracle java 8 license
when: os in ("ubuntu1204", "ubuntu1404") or os == "debian8"
when: os in ("ubuntu1204", "ubuntu1404") and arch != "ppc64" or os == "debian8"
debconf: name='oracle-java8-installer' question='shared/accepted-oracle-license-v1-1' value='true' vtype='select'

- name: update packages
when: arch != "ppc64"
include_role:
name: package-upgrade

- name: download java
when: os in "ubuntu1404" and arch == "ppc64"
get_url:
url: https://github.com/AdoptOpenJDK/openjdk8-releases/releases/download/jdk8u144-b01/OpenJDK8_ppc64le_Linux_jdk8u144-b01.tar.gz
dest: /tmp/

- name: unarchive java
when: os in "ubuntu1404" and arch == "ppc64"
unarchive:
src: /tmp/OpenJDK8_ppc64le_Linux_jdk8u144-b01.tar.gz
remote_src: yes
dest: /home/iojs
tags: java

# if this fails you want to check in vars/main.yml and add package name
# as appropriate -- try to use generic os family if available.
- name: install java
when: not os|startswith("zos")
when: not os|startswith("zos") and arch != "ppc64"
package: name="{{ java_package_name }}" state=present

- name: install webupd8 oracle java 8 extras
when: os in ("ubuntu1204", "ubuntu1404")
when: os in ("ubuntu1204", "ubuntu1404") and arch != "ppc64"
package: name="{{item}}" state=present
with_items:
- ca-certificates
Expand Down
5 changes: 5 additions & 0 deletions ansible/roles/jenkins-worker/templates/upstart.j2
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ setgid iojs
setuid iojs

script

if [ $(uname -i) = "ppc64le" ]; then
export PATH=/home/iojs/jdk8u144-b01/bin:$PATH;
fi

exec java -Xmx{{ server_ram|default('128m') }} \
-jar /home/{{ server_user }}/slave.jar -secret {{ secret }} \
-jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/slave-agent.jnlp
Expand Down

0 comments on commit 443f72e

Please sign in to comment.