From 673ffe8682ab606aaa0c6a33da19940a8d1e759e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= <maxime.lefrancois.86@gmail.com>
Date: Sun, 14 Jun 2020 04:45:49 +0200
Subject: [PATCH] update ci/cd
---
.gitlab-ci.yml | 62 ++++++++++++++++++++++++++++++++-----
examples/saref4agri-ex1.ttl | 7 +++++
ontology/saref4agri.ttl | 2 +-
3 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5367313..09a6d5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,26 @@
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
diff --git a/examples/saref4agri-ex1.ttl b/examples/saref4agri-ex1.ttl
index a07274c..bf406db 100644
--- a/examples/saref4agri-ex1.ttl
+++ b/examples/saref4agri-ex1.ttl
@@ -23,6 +23,13 @@
dcterms:title "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>
rdf:type owl:NamedIndividual ;
.
diff --git a/ontology/saref4agri.ttl b/ontology/saref4agri.ttl
index 5843d40..76ca37f 100644
--- a/ontology/saref4agri.ttl
+++ b/ontology/saref4agri.ttl
@@ -29,7 +29,7 @@
dcterms:license <https://forge.etsi.org/etsi-software-license> ;
dcterms:modified "2020-06-05"^^xsd:date ;
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> ;
vann:preferredNamespacePrefix "s4agri" ;
vann:preferredNamespaceUri "https://saref.etsi.org/saref4agri/" ;
--
GitLab