diff --git a/msd-deploy.yml b/msd-deploy.yml index 86985f5..1358797 100644 --- a/msd-deploy.yml +++ b/msd-deploy.yml @@ -26,7 +26,7 @@ cache: TXT_CLEAR: "\e[0m" TXT_YELLOW: "\e[33m" - image: inraep2m2/service-rdf-database-deployment:1.0.9 + image: inraep2m2/service-rdf-database-deployment:1.0.10 tags: [docker] before_script: - '[ -z "$SSH_OPTS" ] && echo "SSH_OPTS is Empty" && exit 1' diff --git a/src/main/scala/fr/inrae/metabolomics/services/ServiceRdfDatabaseDeployment.scala b/src/main/scala/fr/inrae/metabolomics/services/ServiceRdfDatabaseDeployment.scala index 9d1b870..083b9e3 100755 --- a/src/main/scala/fr/inrae/metabolomics/services/ServiceRdfDatabaseDeployment.scala +++ b/src/main/scala/fr/inrae/metabolomics/services/ServiceRdfDatabaseDeployment.scala @@ -100,8 +100,8 @@ case object ServiceRdfDatabaseDeployment extends App { println("# == service database deployment / Metabolomics Semantic Data lake / MetaboHUB == ") // if you want to access the command line args: println("# -- args : "); - args.foreach(x => print(x+" ")) - println("") + args.foreach(x => println(x+" ")) + val script = """ hdfs dfs mkdir diff --git a/src/main/scala/fr/inrae/semantic_web/ProvenanceBuilder.scala b/src/main/scala/fr/inrae/semantic_web/ProvenanceBuilder.scala index acdfc61..a34ba4c 100644 --- a/src/main/scala/fr/inrae/semantic_web/ProvenanceBuilder.scala +++ b/src/main/scala/fr/inrae/semantic_web/ProvenanceBuilder.scala @@ -56,6 +56,7 @@ case object ProvenanceBuilder { .add(DCTERMS.TITLE,release) .add(DCTERMS.MODIFIED,literal(startDate,XSD.DATETIME) ) .add(PROV.WAS_GENERATED_BY, s"$ciPipelineUrl") + .add(DCAT.ACCESS_URL,s"hdfs://rdf/${category}/${database}/${release}") val endString : String = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date()) diff --git a/src/test/scala/fr/inrae/metabolomics/services/ServiceRdfDatabaseDeploymentTest.scala b/src/test/scala/fr/inrae/metabolomics/services/ServiceRdfDatabaseDeploymentTest.scala index 45cabcf..8f5ddd3 100644 --- a/src/test/scala/fr/inrae/metabolomics/services/ServiceRdfDatabaseDeploymentTest.scala +++ b/src/test/scala/fr/inrae/metabolomics/services/ServiceRdfDatabaseDeploymentTest.scala @@ -101,7 +101,7 @@ object ServiceRdfDatabaseDeploymentTest extends TestSuite { println("=============================================================================================") // all mkdir should have -p option to avoid an error assert(!lines.filter( x => x.contains("mkdir")).exists(x => !x.contains(" -p"))) - assert(!lines.exists( x => x.contains("hdfs") && !x.contains("/usr/local/hadoop/bin") ),"Forgot /usr/local/hadoop/bin") + assert(!lines.exists( x => x.contains("hdfs ") && !x.contains("/usr/local/hadoop/bin") ),"Forgot /usr/local/hadoop/bin") } override def utestAfterAll(): Unit = {