diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml index 9376d95..62ceb4c 100644 --- a/smartgears/dataminer_app/tasks/dataminer-app.yml +++ b/smartgears/dataminer_app/tasks/dataminer-app.yml @@ -47,6 +47,10 @@ file: path={{ smartgears_user_home }}/wps_algorithms/algorithms state=directory tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_svn' ] + - name: Install the subversion packages + become_user: root + apt: pkg=subversion state=present update_cache=yes cache_valid_time=1800 force=yes + - 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' ] diff --git a/smartgears/dm_pool_manager/defaults/main.yml b/smartgears/dm_pool_manager/defaults/main.yml index 9cffd16..58c5968 100644 --- a/smartgears/dm_pool_manager/defaults/main.yml +++ b/smartgears/dm_pool_manager/defaults/main.yml @@ -1,7 +1,7 @@ --- dm_pool_manager_install: False dm_pool_manager_upgrade: False -dm_pool_manager_version: 2.1.0-4.7.0-154856 +dm_pool_manager_version: 2.1.0-4.7.0-155090 dm_pool_manager_name: dataminer-pool-manager dm_pool_manager_group_id: org.gcube.dataAnalysis @@ -9,6 +9,8 @@ dm_pool_manager_extension: war dm_pool_manager_file: '{{ dm_pool_manager_name }}-{{ dm_pool_manager_version }}.{{ dm_pool_manager_extension }}' dm_pool_prod_ghost_instance: 'dataminer-proto-ghost.d4science.org' +dm_pool_proto_ghost_instance: 'dataminer-proto-ghost.d4science.org' +dm_pool_preprod_ghost_instance: 'dataminer-ghost-t.pre.d4science.org' dm_pool_dev_ghost_instance: 'dataminer-ghost-d.dev.d4science.org' dm_pool_manager_pkgs: - subversion @@ -18,5 +20,6 @@ svn_user: svn.d4science svn_pass: "{{ vault_svn_pass }}" prod_instance: False proto_instance: False +preprod_instance: False diff --git a/smartgears/dm_pool_manager/templates/service.properties.j2 b/smartgears/dm_pool_manager/templates/service.properties.j2 index a729ea9..8efdbd1 100644 --- a/smartgears/dm_pool_manager/templates/service.properties.j2 +++ b/smartgears/dm_pool_manager/templates/service.properties.j2 @@ -7,6 +7,10 @@ svn.algo.main.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms #STAGE {% if prod_instance %} STAGE_GHOST={{ dm_pool_prod_ghost_instance }} +{% elif proto_instance %} +STAGE_GHOST={{ dm_pool_proto_ghost_instance }} +{% elif preprod_instance %} +STAGE_GHOST={{ dm_pool_preprod_ghost_instance }} {% else %} STAGE_GHOST={{ dm_pool_dev_ghost_instance }} {% endif %} @@ -15,8 +19,8 @@ svn.stage.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms svn.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/dev/software svn.stage.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt svn.stage.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt -svn.stage.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt -svn.stage.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt +svn.stage.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt +svn.stage.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt svn.stage.deps-java = svn.stage.deps-knime-workflow = svn.stage.deps-octave =