Skip to content
Snippets Groups Projects
Commit 0be83509 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

it push

git push stf
Merge branch 'develop-v1.1.2' into prerelease-v1.1.2
parents afe004ec 673ffe86
No related branches found
No related tags found
No related merge requests found
Pipeline #191 failed
image: openjdk:8-jdk 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: script:
- curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build" - 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: except:
- /^prerelease-v/ - /^prerelease-v/
- /^release-v/ - /^release-v/
...@@ -11,21 +28,50 @@ develop: ...@@ -11,21 +28,50 @@ develop:
when: always when: always
paths: paths:
- target/site - target/site
- target/report_output.xml - target/success
reports: reports:
junit: target/report_output.xml junit: target/report_output.xml
release: test-prerelease:
stage: test
script: script:
- curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build" - 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 - java -jar saref-pipeline.jar release -t && touch target/success
only: allow_failure: true
only:
- /^prerelease-v/ - /^prerelease-v/
- /^release-v/
artifacts: artifacts:
when: always when: always
paths: paths:
- target/site - target/site
- target/report_output.xml - target/success
reports: reports:
junit: target/report_output.xml 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
...@@ -23,6 +23,13 @@ ...@@ -23,6 +23,13 @@
dcterms:title "SAREF4AGRI example"@en ; dcterms:title "SAREF4AGRI example"@en ;
dcterms:description "SAREF4AGRI example"@en . dcterms:description "SAREF4AGRI example"@en .
obo:TAXRANK_0000004 a owl:Class .
obo:TAXRANK_0000006 a owl:Class .
obo:TAXRANK_0000003 a owl:Class .
obo:TAXRANK_0000016 a owl:Class .
obo:TAXRANK_0000017 a owl:Class .
<https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/5-5-5_crop_fertilizer> <https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/5-5-5_crop_fertilizer>
rdf:type owl:NamedIndividual ; rdf:type owl:NamedIndividual ;
. .
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
dcterms:license <https://forge.etsi.org/etsi-software-license> ; dcterms:license <https://forge.etsi.org/etsi-software-license> ;
dcterms:modified "2020-06-05"^^xsd:date ; dcterms:modified "2020-06-05"^^xsd:date ;
dcterms:publisher <https://www.etsi.org/> ; dcterms:publisher <https://www.etsi.org/> ;
dcterms:source <https://forge.etsi.org/rep/SAREF/saref4agri/> ; dcterms:source <https://saref.etsi.org/sources/saref4agri/> ;
rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341006/01.01.02_60/ts_10341006v010102p.pdf> ; rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341006/01.01.02_60/ts_10341006v010102p.pdf> ;
vann:preferredNamespacePrefix "s4agri" ; vann:preferredNamespacePrefix "s4agri" ;
vann:preferredNamespaceUri "https://saref.etsi.org/saref4agri/" ; vann:preferredNamespaceUri "https://saref.etsi.org/saref4agri/" ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment