Unverified Commit fb4ee2c3 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'develop-v1.1.2' into release-v1.1.2

parents 33df5e4d c7d5625f
Loading
Loading
Loading
Loading
Loading
+3 −82
Original line number Diff line number Diff line
variables:
    GIT_STRATEGY: fetch
    GIT_DEPTH: 0
    SAREF_DEV_KEY: <my_private_key>
    SAREF_PORTAL_KEY: <my_private_key>

stages:
  - test
  - build
  - deploy


test-develop:
  stage: test
  image: openjdk:11-jre
  script:
    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
    - java -jar saref-pipeline.jar develop -s && touch target/success
  allow_failure: true
  except:
    - /^prerelease-v/
    - /^release-v/
  artifacts:
    when: always
    paths:
      - target/site
      - target/success
    reports:
      junit: target/report_output.xml

test-prerelease:
  stage: test
  image: openjdk:11-jre
  script:
    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
    - java -jar saref-pipeline.jar release -t && touch target/success
  allow_failure: true
  only:
    - /^prerelease-v/
  artifacts:
    when: always
    paths:
      - target/site
      - target/success
    reports:
      junit: target/report_output.xml

# deploy-report:
#   stage: deploy
#   image: alpine:latest
#   script:
#     - apk update
#     - apk add openssh
#     - 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'
#     - scp -P 29419 -pr 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
  image: openjdk:11-jre
  script:
    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
    - 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
include:
  - project: 'saref/saref-core'
    file: '.gitlab-ci.yml'
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
labs.etsi.org/rep/:
  repos:
    - saref/saref4syst
    - saref/saref-core
+118 −118
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
<h3>Platform, System and Deployment</h3>

<p>The model defined in SAREF4AGRI for representing platforms, systems and deployments is depicted in <a href="#Figure_2">Figure 2</a>. The main entities in the modelling are represented by the <a href="http://www.w3.org/ns/ssn/System">ssn:System</a> and <a href="http://www.w3.org/ns/ssn/Deployment">ssn:Deployment</a> classes. Note that the design patterns for modelling these concepts have been taken from the W3C SSN ontology and, as a best practice for reuse, the SAREF4AGRI model refers directly to the URIs of the SSN (<a href="http://www.w3.org/ns/ssn/">http://www.w3.org/ns/ssn/</a>) and SOSA (<a href="http://www.w3.org/ns/sosa/">http://www.w3.org/ns/sosa/</a>) ontologies. </p>
<p>The <a href="http://www.w3.org/ns/ssn/System">ssn:System</a> class in the SSN ontology represents a system and is components as specific devices, actuators or sensors. Moreover, the <a href="http://www.w3.org/ns/ssn/Deployment">ssn:Deployment</a> class from the SSN ontology describes the deployment of one or more systems on a <a href="http://www.w3.org/ns/sosa/Platform">ssn:Platform</a> for a particular purpose for a given time period. SAREF4AGRI defines a <a href="https://saref.etsi.org/core/Device">saref:Device</a> as subclass of an <a href="http://www.w3.org/ns/ssn/System">ssn:System</a> and extends the <a href="http://www.w3.org/ns/ssn/Deployment">ssn:Deployment</a> class by means of the <a href="#s4agri:Deployment">s4agri:Deployment</a> class. In this way, it is possible to represent a specific installation of a certain agricultural system (e.g. a smart irrigation system) in a given space (expressed by means of the property <a href="#s4agri:hasDeploymentPeriod">s4agri:hasDeploymentPeriod</a>) and at a given temporal frame (expressed by means of the property <a href="#s4agri:isDeployedAtSpace">s4agri:isDeployedAtSpace</a>) where SAREF4AGRI devices (e.g. a pluviometer, a soil tensiometer, a weather station and a watering gun) can be deployed. The deployment can involve a given <a href="http://www.w3.org/ns/sosa/Platform">ssn:Platform</a> which hosts the system deployed in such deployment. In order to represent temporal information the TIME ontology has been reused. For the geographical information both the GeoSPARQL ontology (<a href="http://www.opengis.net/ont/geosparql#">http://www.opengis.net/ont/geosparql#</a>) and the WGS84 Geo vocabulary (<a href="http://www.w3.org/2003/01/geo/wgs84_pos#">http://www.w3.org/2003/01/geo/wgs84_pos#</a>) are reused.</p>
<p>The <a href="http://www.w3.org/ns/ssn/System">ssn:System</a> class in the SSN ontology represents a system and is components as specific devices, actuators or sensors. Moreover, the <a href="http://www.w3.org/ns/ssn/Deployment">ssn:Deployment</a> class from the SSN ontology describes the deployment of one or more systems on a <a href="http://www.w3.org/ns/sosa/Platform">ssn:Platform</a> for a particular purpose for a given time period. SAREF4AGRI defines a <a href="https://saref.etsi.org/core/Device">saref:Device</a> as subclass of an <a href="http://www.w3.org/ns/ssn/System">ssn:System</a> and extends the <a href="http://www.w3.org/ns/ssn/Deployment">ssn:Deployment</a> class by means of the <a href="#s4agri:Deployment">s4agri:Deployment</a> class. In this way, it is possible to represent a specific installation of a certain agricultural system (e.g. a smart irrigation system) in a given space (expressed by means of the property <a href="#s4agri:isDeployedAtSpace">s4agri:isDeployedAtSpace</a>) and at a given temporal frame (expressed by means of the property <a href="#s4agri:hasDeploymentPeriod">s4agri:hasDeploymentPeriod</a>) where SAREF4AGRI devices (e.g. a pluviometer, a soil tensiometer, a weather station and a watering gun) can be deployed. The deployment can involve a given <a href="http://www.w3.org/ns/sosa/Platform">ssn:Platform</a> which hosts the system deployed in such deployment. In order to represent temporal information the TIME ontology has been reused. For the geographical information both the GeoSPARQL ontology (<a href="http://www.opengis.net/ont/geosparql#">http://www.opengis.net/ont/geosparql#</a>) and the WGS84 Geo vocabulary (<a href="http://www.w3.org/2003/01/geo/wgs84_pos#">http://www.w3.org/2003/01/geo/wgs84_pos#</a>) are reused.</p>


<figure>
+2 −2
Original line number Diff line number Diff line
@prefix dcterms: <http://purl.org/dc/terms/> .
@prefix dctype: <http://purl.org/dc/dcmitype/> .
@prefix ex: <https://saref.etsi.org/saref4agri/v1.1.2/example/exampleIrrigationUseCase1/> .
@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
@prefix wgs84: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@@ -60,7 +60,7 @@ ex:ArvalisIrrinovStation01SoilSensor01
ex:ArvalisIrrinovStation01SoilSensor02
  rdf:type owl:NamedIndividual ;
  rdf:type s4agri:SoilTensiometer ;
  geo:alt -0.6 ;
  wgs84:alt -0.6 ;
  saref:makesMeasurement ex:ArvalisIrrinovStation01SoilSensor02ObservationAtPT24H2016-06-14T000000_0200 ;
  saref:measuresProperty s4agri:SoilMoisture ;
.
+1 −1
Original line number Diff line number Diff line
@prefix ex: <https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/> .
@prefix foaf: <http://xmlns.com/foaf/spec/#> .
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
@prefix obo: <http://purl.obolibrary.org/obo/> .
@prefix org: <https://schema.org/> .