From b6703aa9b157fb48de166920a917b127a41965ae Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 6 Oct 2017 16:04:00 +0200 Subject: [PATCH] dataminer: The algorithms directory structure has been refactored. --- smartgears/dataminer_app/defaults/main.yml | 2 +- smartgears/dataminer_app/tasks/dataminer-app.yml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/smartgears/dataminer_app/defaults/main.yml b/smartgears/dataminer_app/defaults/main.yml index 8985c5d..55fe004 100644 --- a/smartgears/dataminer_app/defaults/main.yml +++ b/smartgears/dataminer_app/defaults/main.yml @@ -26,7 +26,7 @@ dataminer_algorithms_extension: tar.gz dataminer_algorithms_file: '{{ dataminer_algorithms_name }}-{{ dataminer_algorithms_version }}.{{ dataminer_algorithms_extension }}' dataminer_algorithms_base_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ dataminer_algorithms_gcube_repository }}' # Algorithms updater -dataminer_wps_algorithms_svn: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/algorithms/ +dataminer_wps_algorithms_svn: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/algorithms/{{ dataminer_infra_reference }} dataminer_wps_algorithms_dest: '{{ smartgears_user_home }}/wps_algorithms/algorithms' dataminer_algorithms_updater_cron: present dataminer_algorithms_updater_minute_frequency: "0" diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml index 5e2cd2a..9376d95 100644 --- a/smartgears/dataminer_app/tasks/dataminer-app.yml +++ b/smartgears/dataminer_app/tasks/dataminer-app.yml @@ -44,7 +44,12 @@ notify: Restart smartgears - name: Create a directory where to install the algorithms directory - file: path={{ smartgears_user_home }}/wps_algorithms state=directory + file: path={{ smartgears_user_home }}/wps_algorithms/algorithms state=directory + tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_svn' ] + + - name: Download the WPS algorithms from subversion + subversion: repo={{ dataminer_wps_algorithms_svn }} dest={{ smartgears_user_home }}/wps_algorithms/algorithms/{{ dataminer_infra_reference }} checkout=yes force=yes update=yes + tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_svn' ] - name: Get and unpack the algorithms installer maven_artifact: artifact_id={{ dataminer_algorithms_name }} version={{ dataminer_algorithms_version | default(omit) }} group_id={{ dataminer_algorithms_group_id }} extension={{ dataminer_algorithms_extension | default('war') }} repository_url={{ dataminer_algorithms_base_url }} dest={{ smartgears_downloads_dir }}/{{ dataminer_algorithms_file }} @@ -60,10 +65,6 @@ unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ dataminer_algorithms_file }} dest={{ smartgears_user_home }} creates='{{ smartgears_user_home }}/algorithmInstaller/addAlgorithm.sh' tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_installer' ] - - name: Download the WPS algorithms from subversion - subversion: repo={{ dataminer_wps_algorithms_svn }} dest={{ smartgears_user_home }}/wps_algorithms/algorithms checkout=yes force=yes update=yes - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_svn' ] - - name: Create a directory where to install the algorithms updater logs and data file: path={{ smartgears_user_home }}/wps_algorithms_install_log state=directory tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_script' ]