D-Net
/
dnet-hadoop
13
4
Fork 10
Code Issues 14 Pull Requests 8 Projects 2 Releases 1 Wiki Activity

Merge branch 'beta' of https://code-repo.d4science.org/D-Net/dnet-hadoop into beta

This commit is contained in:
Miriam Baglioni 2021-08-20 11:13:47 +02:00
parent 882abb40e4 a053e1513c
commit 5f8ccbc365
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/00_beta_graph_for_IIS.xml
View File

@ -11,10 +11,20 @@
<WORKFLOW_TYPE>IIS</WORKFLOW_TYPE> <WORKFLOW_TYPE>IIS</WORKFLOW_TYPE>
<WORKFLOW_PRIORITY>30</WORKFLOW_PRIORITY> <WORKFLOW_PRIORITY>30</WORKFLOW_PRIORITY>
<CONFIGURATION start="manual"> <CONFIGURATION start="manual">
<NODE isStart="true" name="setNsPrefixBlacklist" type="SetEnvParameter"> <NODE isStart="true" name="setNsPrefixBlacklistForBETA" type="SetEnvParameter">
<DESCRIPTION>set blacklist of funder nsPrefixes</DESCRIPTION> <DESCRIPTION>set blacklist of funder nsPrefixes from the beta aggregator</DESCRIPTION>
<PARAMETERS> <PARAMETERS>
<PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist</PARAM> <PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist_BETA</PARAM>
<PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________,fct_________</PARAM>
</PARAMETERS>
<ARCS>
<ARC to="waitConfig"/>
</ARCS>
</NODE>
<NODE isStart="true" name="setNsPrefixBlacklistForPROD" type="SetEnvParameter">
<DESCRIPTION>set blacklist of funder nsPrefixes from the production aggregator</DESCRIPTION>
<PARAMETERS>
<PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist_PROD</PARAM>
<PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________</PARAM> <PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________</PARAM>
</PARAMETERS> </PARAMETERS>
<ARCS> <ARCS>
@ -375,7 +385,7 @@
'reuseOAF' : 'reuseOAF_BETA', 'reuseOAF' : 'reuseOAF_BETA',
'reuseOAF_hdfs' : 'reuseOAFhdfs_BETA', 'reuseOAF_hdfs' : 'reuseOAFhdfs_BETA',
'contentPath' : 'betaContentPath', 'contentPath' : 'betaContentPath',
'nsPrefixBlacklist' : 'nsPrefixBlacklist', 'nsPrefixBlacklist' : 'nsPrefixBlacklist_BETA',
'shouldPatchRelations' : 'shouldPatchRelations_BETA', 'shouldPatchRelations' : 'shouldPatchRelations_BETA',
'idMappingPath' : 'idMappingPath' 'idMappingPath' : 'idMappingPath'
} }
@ -421,7 +431,7 @@
'reuseOAF' : 'reuseOAF_PROD', 'reuseOAF' : 'reuseOAF_PROD',
'reuseOAF_hdfs' : 'reuseOAFhdfs_PROD', 'reuseOAF_hdfs' : 'reuseOAFhdfs_PROD',
'contentPath' : 'prodContentPath', 'contentPath' : 'prodContentPath',
'nsPrefixBlacklist' : 'nsPrefixBlacklist', 'nsPrefixBlacklist' : 'nsPrefixBlacklist_PROD',
'shouldPatchRelations' : 'shouldPatchRelations_PROD', 'shouldPatchRelations' : 'shouldPatchRelations_PROD',
'idMappingPath' : 'idMappingPath' 'idMappingPath' : 'idMappingPath'
} }

20
dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/02_beta_graph.xml
View File

@ -11,10 +11,20 @@
<WORKFLOW_TYPE>Data Provision</WORKFLOW_TYPE> <WORKFLOW_TYPE>Data Provision</WORKFLOW_TYPE>
<WORKFLOW_PRIORITY>30</WORKFLOW_PRIORITY> <WORKFLOW_PRIORITY>30</WORKFLOW_PRIORITY>
<CONFIGURATION start="manual"> <CONFIGURATION start="manual">
<NODE isStart="true" name="setNsPrefixBlacklist" type="SetEnvParameter"> <NODE isStart="true" name="setNsPrefixBlacklistForBETA" type="SetEnvParameter">
<DESCRIPTION>set blacklist of funder nsPrefixes</DESCRIPTION> <DESCRIPTION>set blacklist of funder nsPrefixes from the beta aggregator</DESCRIPTION>
<PARAMETERS> <PARAMETERS>
<PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist</PARAM> <PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist_BETA</PARAM>
<PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________,fct_________</PARAM>
</PARAMETERS>
<ARCS>
<ARC to="waitConfig"/>
</ARCS>
</NODE>
<NODE isStart="true" name="setNsPrefixBlacklistForPROD" type="SetEnvParameter">
<DESCRIPTION>set blacklist of funder nsPrefixes from the production aggregator</DESCRIPTION>
<PARAMETERS>
<PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist_PROD</PARAM>
<PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________</PARAM> <PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________</PARAM>
</PARAMETERS> </PARAMETERS>
<ARCS> <ARCS>
@ -497,7 +507,7 @@
'reuseOAF' : 'reuseOAF_BETA', 'reuseOAF' : 'reuseOAF_BETA',
'reuseOAF_hdfs' : 'reuseOAFhdfs_BETA', 'reuseOAF_hdfs' : 'reuseOAFhdfs_BETA',
'contentPath' : 'betaContentPath', 'contentPath' : 'betaContentPath',
'nsPrefixBlacklist' : 'nsPrefixBlacklist', 'nsPrefixBlacklist' : 'nsPrefixBlacklist_BETA',
'shouldPatchRelations' : 'shouldPatchRelations_BETA', 'shouldPatchRelations' : 'shouldPatchRelations_BETA',
'idMappingPath' : 'idMappingPath' 'idMappingPath' : 'idMappingPath'
} }
@ -543,7 +553,7 @@
'reuseOAF' : 'reuseOAF_PROD', 'reuseOAF' : 'reuseOAF_PROD',
'reuseOAF_hdfs' : 'reuseOAFhdfs_PROD', 'reuseOAF_hdfs' : 'reuseOAFhdfs_PROD',
'contentPath' : 'prodContentPath', 'contentPath' : 'prodContentPath',
'nsPrefixBlacklist' : 'nsPrefixBlacklist', 'nsPrefixBlacklist' : 'nsPrefixBlacklist_PROD',
'shouldPatchRelations' : 'shouldPatchRelations_PROD', 'shouldPatchRelations' : 'shouldPatchRelations_PROD',
'idMappingPath' : 'idMappingPath' 'idMappingPath' : 'idMappingPath'
} }