Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: ubuntu 14.04 ppc64le #1075

Closed
wants to merge 4 commits into from
Closed

WIP: ubuntu 14.04 ppc64le #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8cd549
ubuntu 14.04 ppcle64
jBarz Jan 5, 2018
4e0a7bf
Add the jdk to PATH in .profile
jBarz Feb 6, 2018
f39ff97
skip certain java install operations on ppc64
jBarz Feb 8, 2018
e062922
set java path in upstart script
jBarz Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ansible/inventory.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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