[airavata] branch develop updated: Ansible: update to openjdk 11, maven 3.6.2

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


View the commit online:
https://github.com/apache/airavata/commit/fd56623e303e579d7974b721ecd7f931498ad502

The following commit(s) were added to refs/heads/develop by this push:
     new fd56623  Ansible: update to openjdk 11, maven 3.6.2
fd56623 is described below

commit fd56623e303e579d7974b721ecd7f931498ad502
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Nov 20 13:05:10 2019 -0500

    Ansible: update to openjdk 11, maven 3.6.2
---
 dev-tools/ansible/roles/common/defaults/main.yml  |  3 +++
 dev-tools/ansible/roles/common/tasks/main.yml     | 23 ++++++++++++++++++--
 dev-tools/ansible/roles/common/templates/maven.sh |  1 +
 dev-tools/ansible/roles/java/tasks/main.yml       | 26 +++++------------------
 dev-tools/ansible/roles/java/vars/main.yml        | 14 +-----------
 5 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/dev-tools/ansible/roles/common/defaults/main.yml b/dev-tools/ansible/roles/common/defaults/main.yml
index afc80f5..e5635e1 100644
--- a/dev-tools/ansible/roles/common/defaults/main.yml
+++ b/dev-tools/ansible/roles/common/defaults/main.yml
@@ -21,3 +21,6 @@
 keystore_src_path: "airavata.jks"
 client_truststore_src_path: "airavata.jks"
 cred_keystore_src_path: "airavata_sym.jks"
+
+apache_maven_version: "apache-maven-3.6.2"
+apache_maven_url: "https://www-eu.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz"
diff --git a/dev-tools/ansible/roles/common/tasks/main.yml b/dev-tools/ansible/roles/common/tasks/main.yml
index eb49946..f72118d 100644
--- a/dev-tools/ansible/roles/common/tasks/main.yml
+++ b/dev-tools/ansible/roles/common/tasks/main.yml
@@ -23,7 +23,26 @@
   yum: name={{ item }} state=latest update_cache=yes
   with_items:
     - git
-    - maven
+  become_user: root
+
+- name: download {{ apache_maven_version }}
+  get_url: url="{{ apache_maven_url }}" dest="/opt/{{ apache_maven_version }}-bin.tar.gz"
+  become: yes
+  become_user: root
+
+- name: unzip maven
+  unarchive:
+    src: /opt/{{ apache_maven_version }}-bin.tar.gz
+    dest: /opt
+    remote_src: yes
+  become: yes
+  become_user: root
+
+- name: add maven to PATH
+  template:
+    src: maven.sh
+    dest: /etc/profile.d/maven.sh
+  become: yes
   become_user: root
 
 # Setup airavata source
@@ -45,7 +64,7 @@
   tags: update
 
 - name: Run maven build
-  command: mvn clean install -Dmaven.test.skip=true chdir="{{ airavata_source_dir }}/"
+  command: /opt/{{apache_maven_version}}/bin/mvn clean install -Dmaven.test.skip=true chdir="{{ airavata_source_dir }}/"
   environment:
       MAVEN_OPTS: "-Xmx2048m"
   register: build
diff --git a/dev-tools/ansible/roles/common/templates/maven.sh b/dev-tools/ansible/roles/common/templates/maven.sh
new file mode 100644
index 0000000..d51dd7e
--- /dev/null
+++ b/dev-tools/ansible/roles/common/templates/maven.sh
@@ -0,0 +1 @@
+export PATH=/opt/{{ apache_maven_version }}/bin:${PATH}
diff --git a/dev-tools/ansible/roles/java/tasks/main.yml b/dev-tools/ansible/roles/java/tasks/main.yml
index e49d32f..9709631 100644
--- a/dev-tools/ansible/roles/java/tasks/main.yml
+++ b/dev-tools/ansible/roles/java/tasks/main.yml
@@ -19,35 +19,19 @@
 #
 
 ---
-- name: Check if oracle java 8 rpm already downloaded
-  stat:
-    path: "{{ java_dir_source }}/{{ java_rpm_filename }}"
-  register: rpm_stat_result
+- name: Install OpenJDK 11
+  yum: name=java-11-openjdk-devel state=latest update_cache=yes
   tags:
     - always
 
-# Install Oracle Java
-- name: download oracle java 8 rpm
-  get_url: url="{{ java_rpm_url }}" dest="{{ java_dir_source }}" headers='Cookie:oraclelicense=accept-securebackup-cookie'
-  become: yes
-  tags:
-       - always
-  when: not rpm_stat_result.stat.exists
-
-- name: Install oracle java 8
-  yum: name="{{ java_dir_source }}/{{ java_rpm_filename }}" state=present
-  become: yes
-  tags:
-       - always
-
-- name: set Oracle Java {{ java_version_string }} as default
+- name: set {{ java_home }} as default
   alternatives:
     name="{{ item.exe }}"
     link="/usr/bin/{{ item.exe }}"
     path="{{ item.path }}/{{ item.exe }}"
   with_items:
-    - { path: "{{ java_home }}/jre/bin", exe: 'java' }
-    - { path: "{{ java_home }}/jre/bin", exe: 'keytool' }
+    - { path: "{{ java_home }}/bin", exe: 'java' }
+    - { path: "{{ java_home }}/bin", exe: 'keytool' }
     - { path: "{{ java_home }}/bin", exe: 'javac' }
     - { path: "{{ java_home }}/bin", exe: 'javadoc' }
   become: yes
diff --git a/dev-tools/ansible/roles/java/vars/main.yml b/dev-tools/ansible/roles/java/vars/main.yml
index 10026c3..62152d1 100644
--- a/dev-tools/ansible/roles/java/vars/main.yml
+++ b/dev-tools/ansible/roles/java/vars/main.yml
@@ -20,18 +20,6 @@
 
 ---
 #Variables associated with this role
-# Oracle Java 8
-java_dir_source: "/usr/local/src"
-
-java_version: 8
-java_version_update: 131
-java_version_build: '11'
-java_version_string: "1.{{ java_version }}.0_{{ java_version_update }}"
-java_home: "/usr/java/jdk1.{{ java_version }}.0_{{ java_version_update }}"
-
-java_rpm_filename: "jdk-{{ java_version }}u{{ java_version_update }}-linux-x64.rpm"
-#java_rpm_url: "http://download.oracle.com/otn/java/jdk/{{ java_version }}u{{ java_version_update }}-b{{ java_version_build }}/{{ java_rpm_filename }}"
-# Format of URL changed, just hardcoding it here
-java_rpm_url: "http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm"
 
+java_home: "/usr/lib/jvm/java-11"
 ...