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

Merge branch 'prerelease-v1.1.1' into 'release-v1.1.1'

Prerelease v1.1.1

See merge request !2
parents b2b39d0c b759ed7f
Loading
Loading
Loading
Loading
Loading
+24 −19
Original line number Diff line number Diff line
image: openjdk:8-jdk

variables:
    GIT_STRATEGY: fetch
    GIT_DEPTH: 0
    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
  image: openjdk:11-jre
  script:
    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
    - 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:
@@ -34,8 +30,9 @@ test-develop:

test-prerelease:
  stage: test
  image: openjdk:11-jre
  script:
    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
    - 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:
@@ -48,19 +45,27 @@ test-prerelease:
    reports:
      junit: target/report_output.xml

deploy-report:
  stage: deploy
  script:
    - scp -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/
# 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/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
    - 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/
+18 −17
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@
  vann:preferredNamespaceUri "https://saref.etsi.org/saref4ehaw/" ;
  dcterms:issued "2020-02-01"^^xsd:date ;
  dcterms:modified "2020-05-01"^^xsd:date ;
  rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341008/01.01.01_60/ts_10341008v010101p.pdf> ;
  dcterms:title "SAREF4EHAW: an extension of SAREF for eHealth Ageing Well domain"@en ;
  dcterms:description """The objective of SAREF4EHAW is to extend SAREF ontology for the eHealth/Ageing-well (EHAW) vertical. Clause 4.1 of the present document shortly introduces a high level view of the envisioned SAREF4EHAW semantic model and modular ontology, with the retained concepts (i.e. classes) and their relations. 
SAREF4EHAW extension has been specified and formalised by investigating EHAW domain related resources, as reported in ETSI TR 103 509, such as: potential stakeholders, standardization initiatives, alliances/associations, European projects, EC directives, existing ontologies, and data repositories. Therefore, SAREF4EHAW modular ontology shall both: