solved comment issues from pipeline

7afb051a · Maxime Lefrançois · a2f8b123 · 7afb051a · 7afb051a · 7afb051a
Commit 7afb051a authored Jun 16, 2020 by Maxime Lefrançois
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 image: openjdk:8-jdk

-develop:
+variables:
+    SAREF_DEV_KEY: <my_private_key>
+    SAREF_PORTAL_KEY: <my_private_key>
+
+before_script:
+  - eval $(ssh-agent -s)
+  - ssh-add <(echo "$SAREF_DEV_KEY")
+  - mkdir -p ~/.ssh
+  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+
+stages:
+  - test
+  - build
+  - deploy
+
+test-develop:
+  stage: test
  script:
    - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
-    - java -jar saref-pipeline.jar develop -s
+    - java -jar saref-pipeline.jar develop -s && touch target/success
+  allow_failure: true
  except:
    - /^prerelease-v/
    - /^release-v/
@@ -11,21 +28,50 @@ develop:
    when: always
    paths:
      - target/site
-      - target/report_output.xml
+      - target/success
    reports:
      junit: target/report_output.xml

-release:
+test-prerelease:
+  stage: test
  script:
    - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
-    - java -jar saref-pipeline.jar release
-  only: 
+    - java -jar saref-pipeline.jar release -t && touch target/success
+  allow_failure: true
+  only:
    - /^prerelease-v/
-    - /^release-v/
  artifacts:
    when: always
    paths:
      - target/site
-      - target/report_output.xml
+      - target/success
    reports:
      junit: target/report_output.xml
+
+deploy-report:
+  stage: deploy
+  script:
+    - scp -pr '-P 29419' target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
+    - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 
+    - exit $(test -f target/success) $?
+  except:
+    - /^release-v/
+
+test-release:
+  stage: test
+  script:
+    - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
+    - java -jar saref-pipeline.jar release -t
+  only:
+    - /^release-v/
+
+trigger-release:
+  stage: deploy
+  only:
+    - /^release-v/
+  variables:
+    SAREF_DEV_KEY: $SAREF_DEV_KEY
+    SAREF_PORTAL_KEY: $SAREF_PORTAL_KEY
+  trigger:
+    project: saref/saref-portal
+    branch: master
--- a/.saref-repositories.yml
+++ b/.saref-repositories.yml
+forge.etsi.org/rep/:
+  repos:
+    - saref/saref-core
+    - saref/saref4bldg
+    - saref/saref4envi
+    - saref/saref4ener
--- a/ontology/saref4inma.ttl
+++ b/ontology/saref4inma.ttl
@@ -15,26 +15,28 @@
 @base <https://saref.etsi.org/saref4inma/> .

 <https://saref.etsi.org/saref4inma/> rdf:type owl:Ontology ;
-                                   dct:modified "2020-05-25"^^xsd:date ;
-                                   dct:title "SAREF4INMA: an extension of SAREF for the industry and manufacturing domain"@en ;
-                                   dct:issued "2019-04-30"^^xsd:date ;
-                          vann:preferredNamespacePrefix "s4inma" ;
-                          vann:preferredNamespaceUri "https://saref.etsi.org/saref4inma/"^^xsd:anyURI ;
-                                   dct:creator <https://www.linkedin.com/in/lauradaniele> ;
-                                   dct:contributor [ a schema:Person ; schema:givenName "Matthijs" ; schema:familyName "Punter" ; schema:affiliation [ a schema:Organization ; schema:name "TNO" ] ] ;
-                                   dct:creator <http://www.garcia-castro.com/foaf.rdf#me> ;
-                                   dct:source <https://forge.etsi.org/rep/SAREF/saref4inma> ;
-                                   dct:publisher <https://www.etsi.org/> ;
-                                   dct:description "SAREF4INMA is an extension of SAREF for the industry and manufacturing domain. SAREF4INMA focuses on extending SAREF for the industry and manufacturing domain to solve the lack of interoperability between various types of production equipment that produce items in a factory and, once outside the factory, between different organizations in the value chain to uniquely track back the produced items to the corresponding production equipment, batches, material and precise time in which they were manufactured. SAREF4INMA is specified and published by ETSI in the TS 103 410-5 associated to this ontology file. SAREF4INMA was created to be aligned with related initiatives in the smart industry and manufacturing domain in terms of modelling and standardization, such as the Reference Architecture Model for Industry 4.0 (RAMI), which combines several standards used by the various national initiatives in Europe that support digitalization in manufacturing. The full list of use cases, standards and requirements that guided the creation of SAREF4INMA are described in the associated ETSI TR 103 507. "^^xsd:string ;
-                                   dct:creator <https://www.linkedin.com/in/mderoode> ;
-                                   dct:license <https://forge.etsi.org/etsi-software-license> ;
-                                   dct:contributor <http://purl.org/net/mpoveda> ;
-                                   dct:creator [ a schema:Person ; schema:givenName "Alba" ; schema:familyName "Fernandez Izquierdo" ; schema:affiliation [ a schema:Organization ; schema:name "UPM" ] ] ;
-                                   dct:created "2015-03-29"^^xsd:date ;
-                                   rdfs:comment """Information about changes compared to version 1.1.1: 
- - Updated namespaces for compatibility with SAREF v3."""@en ;
-                                      owl:versionIRI <https://saref.etsi.org/saref4inma/v1.1.2/> ;
-                                      owl:versionInfo "v1.1.2" .
+  dct:modified "2020-05-25"^^xsd:date ;
+  dct:title "SAREF4INMA: an extension of SAREF for the industry and manufacturing domain"@en ;
+  dct:issued "2019-04-30"^^xsd:date ;
+  owl:imports <https://saref.etsi.org/core/v3.1.1/> ;
+  vann:preferredNamespacePrefix "s4inma" ;
+  vann:preferredNamespaceUri "https://saref.etsi.org/saref4inma/" ;
+  dct:creator <https://www.linkedin.com/in/lauradaniele> ;
+  dct:contributor [ a schema:Person ; schema:givenName "Matthijs" ; schema:familyName "Punter" ; schema:affiliation [ a schema:Organization ; schema:name "TNO" ] ] ;
+  dct:creator <http://www.garcia-castro.com/foaf.rdf#me> ;
+  dct:source <https://saref.etsi.org/sources/saref4inma/> ;
+  rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341005/01.01.02_60/ts_10341005v010102p.pdf> ;
+  dct:publisher <https://www.etsi.org/> ;
+  dct:description "SAREF4INMA is an extension of SAREF for the industry and manufacturing domain. SAREF4INMA focuses on extending SAREF for the industry and manufacturing domain to solve the lack of interoperability between various types of production equipment that produce items in a factory and, once outside the factory, between different organizations in the value chain to uniquely track back the produced items to the corresponding production equipment, batches, material and precise time in which they were manufactured. SAREF4INMA is specified and published by ETSI in the TS 103 410-5 associated to this ontology file. SAREF4INMA was created to be aligned with related initiatives in the smart industry and manufacturing domain in terms of modelling and standardization, such as the Reference Architecture Model for Industry 4.0 (RAMI), which combines several standards used by the various national initiatives in Europe that support digitalization in manufacturing. The full list of use cases, standards and requirements that guided the creation of SAREF4INMA are described in the associated ETSI TR 103 507. "^^xsd:string ;
+  dct:creator <https://www.linkedin.com/in/mderoode> ;
+  dct:license <https://forge.etsi.org/etsi-software-license> ;
+  dct:contributor <http://purl.org/net/mpoveda> ;
+  dct:creator [ a schema:Person ; schema:givenName "Alba" ; schema:familyName "Fernandez Izquierdo" ; schema:affiliation [ a schema:Organization ; schema:name "UPM" ] ] ;
+  dct:created "2015-03-29"^^xsd:date ;
+  rdfs:comment """Information about changes compared to version 1.1.1: 
+  - Updated namespaces for compatibility with SAREF v3."""@en ;
+    owl:versionIRI <https://saref.etsi.org/saref4inma/v1.1.2/> ;
+    owl:versionInfo "v1.1.2" .


 dct:issued a owl:AnnotationProperty .
@@ -135,12 +137,14 @@ s4inma:creates rdf:type owl:ObjectProperty ;

 ###  https://saref.etsi.org/saref4inma/hasFeatureOfInterest
 s4inma:hasFeatureOfInterest rdf:type owl:ObjectProperty ;
-                            owl:inverseOf s4inma:isFeatureOfInterestOf ;
-                            rdfs:label "has feature of interest"@en .
+  rdfs:comment "Relation between a measurement and the feature of interest it is about"@en ;
+  owl:inverseOf s4inma:isFeatureOfInterestOf ;
+  rdfs:label "has feature of interest"@en .


 ###  https://saref.etsi.org/saref4inma/hasGTIN12ID
 s4inma:hasGTIN12ID rdf:type owl:ObjectProperty ;
+  rdfs:comment "Global Trade Item Number 12 digits long"@en ;
                   rdfs:subPropertyOf s4inma:hasIdentifier ;
                   rdfs:range s4inma:GTIN12ID ;
                   rdfs:label "has GTIN12ID "@en .
@@ -148,6 +152,7 @@ s4inma:hasGTIN12ID rdf:type owl:ObjectProperty ;

 ###  https://saref.etsi.org/saref4inma/hasGTIN13ID
 s4inma:hasGTIN13ID rdf:type owl:ObjectProperty ;
+  rdfs:comment "Global Trade Item Number 13 digits long"@en ;
                   rdfs:subPropertyOf s4inma:hasIdentifier ;
                   rdfs:range s4inma:GTIN13ID ;
                   rdfs:label "has GTIN13ID"@en .
@@ -155,6 +160,7 @@ s4inma:hasGTIN13ID rdf:type owl:ObjectProperty ;

 ###  https://saref.etsi.org/saref4inma/hasGTIN14ID
 s4inma:hasGTIN14ID rdf:type owl:ObjectProperty ;
+  rdfs:comment "Global Trade Item Number 14 digits long"@en ;
                   rdfs:subPropertyOf s4inma:hasIdentifier ;
                   rdfs:range s4inma:GTIN14ID ;
                   rdfs:label "has GTIN14ID"@en .
@@ -162,6 +168,7 @@ s4inma:hasGTIN14ID rdf:type owl:ObjectProperty ;

 ###  https://saref.etsi.org/saref4inma/hasGTIN8ID
 s4inma:hasGTIN8ID rdf:type owl:ObjectProperty ;
+  rdfs:comment "Global Trade Item Number 8 digits long"@en ;
                  rdfs:subPropertyOf s4inma:hasIdentifier ;
                  rdfs:range s4inma:GTIN8ID ;
                  rdfs:label "has GTIN8ID"@en .
@@ -169,6 +176,7 @@ s4inma:hasGTIN8ID rdf:type owl:ObjectProperty ;

 ###  https://saref.etsi.org/saref4inma/hasIRDI
 s4inma:hasIRDI rdf:type owl:ObjectProperty ;
+  rdfs:comment "The international registration data identifier (IRDI) is an internationally unique identifier for a data element. Source: ISO/IEC 11179, Part 3, Basic Attributes of Data Elements (draft)"@en ;
               rdfs:subPropertyOf s4inma:hasIdentifier ;
               rdfs:range s4inma:IRDI ;
               rdfs:label "has IRDI"@en .
@@ -189,6 +197,7 @@ s4inma:hasSize rdf:type owl:ObjectProperty ;

 ###  https://saref.etsi.org/saref4inma/hasUUID
 s4inma:hasUUID rdf:type owl:ObjectProperty ;
+  rdfs:comment "Link between an entity and its UUID Universally Unique IDentifier"@en ;
               rdfs:subPropertyOf s4inma:hasIdentifier ;
               rdfs:range s4inma:UUID ;
               rdfs:label "has UUID"@en .
@@ -202,6 +211,7 @@ s4inma:hasUpdate rdf:type owl:ObjectProperty ;

 ###  https://saref.etsi.org/saref4inma/isCategoryOf
 s4inma:isCategoryOf rdf:type owl:ObjectProperty ;
+  rdfs:comment "A relation between a category and the set of items in this category."@en ;
                    rdfs:label "is category of"@en .


@@ -213,6 +223,7 @@ s4inma:isCreatedIn rdf:type owl:ObjectProperty ;

 ###  https://saref.etsi.org/saref4inma/isFeatureOfInterestOf
 s4inma:isFeatureOfInterestOf rdf:type owl:ObjectProperty ;
+  rdfs:comment "relation between a feature of interest and a measurement"@en ;
                             rdfs:label "is feature of interest of"@en .


@@ -265,6 +276,7 @@ s4inma:hasCertificate rdf:type owl:DatatypeProperty ;

 ###  https://saref.etsi.org/saref4inma/hasGTIN12IDValue
 s4inma:hasGTIN12IDValue rdf:type owl:DatatypeProperty ;
+  rdfs:comment "Value for the Global Trade Item Number 12 digits long identifier"@en ;
                        rdfs:subPropertyOf s4inma:hasIDValue ;
                        rdfs:range xsd:string ;
                        rdfs:label "has GTIN12ID value"@en .
@@ -272,6 +284,7 @@ s4inma:hasGTIN12IDValue rdf:type owl:DatatypeProperty ;

 ###  https://saref.etsi.org/saref4inma/hasGTIN13IDValue
 s4inma:hasGTIN13IDValue rdf:type owl:DatatypeProperty ;
+  rdfs:comment "Value for the Global Trade Item Number 13 digits long identifier"@en ;
                        rdfs:subPropertyOf s4inma:hasIDValue ;
                        rdfs:range xsd:string ;
                        rdfs:label "has GTIN13ID value"@en .
@@ -279,6 +292,7 @@ s4inma:hasGTIN13IDValue rdf:type owl:DatatypeProperty ;

 ###  https://saref.etsi.org/saref4inma/hasGTIN14IDValue
 s4inma:hasGTIN14IDValue rdf:type owl:DatatypeProperty ;
+  rdfs:comment "Value for the Global Trade Item Number 14 digits long identifier"@en ;
                        rdfs:subPropertyOf s4inma:hasIDValue ;
                        rdfs:range xsd:string ;
                        rdfs:label "has GTIN14ID"@en .
@@ -286,6 +300,7 @@ s4inma:hasGTIN14IDValue rdf:type owl:DatatypeProperty ;

 ###  https://saref.etsi.org/saref4inma/hasGTIN8IDValue
 s4inma:hasGTIN8IDValue rdf:type owl:DatatypeProperty ;
+  rdfs:comment "Value for the Global Trade Item Number 8 digits long identifier"@en ;
                       rdfs:subPropertyOf s4inma:hasIDValue ;
                       rdfs:range xsd:string ;
                        rdfs:label "has GTIN8ID Value"@en .
@@ -300,6 +315,7 @@ s4inma:hasIDValue rdf:type owl:DatatypeProperty ;

 ###  https://saref.etsi.org/saref4inma/hasIRDIValue
 s4inma:hasIRDIValue rdf:type owl:DatatypeProperty ;
+ rdfs:comment "Value for the international registration data identifier"@en ;
                    rdfs:subPropertyOf s4inma:hasIDValue ;
                    rdfs:range xsd:string ;
                    rdfs:label "has IRDI"@en .
@@ -319,6 +335,7 @@ s4inma:hasSerialNumber rdf:type owl:DatatypeProperty ;

 ###  https://saref.etsi.org/saref4inma/hasUUIDValue
 s4inma:hasUUIDValue rdf:type owl:DatatypeProperty ;
+ rdfs:comment "Value for the Universally Unique IDentifier"@en ;
                    rdfs:subPropertyOf s4inma:hasIDValue ;
                    rdfs:range xsd:string ;
                    rdfs:label "has UUID value"@en .
@@ -639,6 +656,7 @@ s4inma:ProductionEquipmentCategory rdf:type owl:Class ;

 ###  https://saref.etsi.org/saref4inma/ProductionEquipmentFunction
 s4inma:ProductionEquipmentFunction rdf:type owl:Class ;
+  rdfs:comment "The class of functions of production equipments"@en ;
                                   rdfs:subClassOf owl:Thing ,
                                                   saref:Function ;
                                   rdfs:label "Production equipment function"@en .