Commit ae89ada2 authored by Raul Garcia-Castro's avatar Raul Garcia-Castro
Browse files

Merge branch 'develop-v2.1.1' into 'develop-v1.1.1' 

Created new branch Develop v2.1.1

See merge request !3
parents 95fca6c3 1903a7ac

.gitlab-ci.yml

+17 −12
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:
@@ -50,8 +47,15 @@ test-prerelease: 


deploy-report:

  stage: deploy

  image: alpine:latest

  script:

    - scp -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID

    - 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:
@@ -59,8 +63,9 @@ deploy-report: 


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/

ontology/saref4watr.ttl

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
                                      dcterms:issued "2020-04-01"^^xsd:date ;

                                      dcterms:license <https://forge.etsi.org/etsi-software-license> ;

                                      dcterms:source <https://saref.etsi.org/sources/saref4watr/> ;

                                      rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341010/01.01.01_60/ts_10341010v010101p.pdf> ;

                                      vann:preferredNamespacePrefix "s4watr" ;

                                      vann:preferredNamespaceUri "https://saref.etsi.org/saref4watr/" .