diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fda4ae18c308adeaa52797040011d4613546e149..8eb754add957115001807157a3c2597844d66126 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,24 +1,20 @@ -image: openjdk:8-jdk - variables: + GIT_STRATEGY: fetch + GIT_DEPTH: 0 SAREF_DEV_KEY: SAREF_PORTAL_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/ diff --git a/examples/saref4agri-ex1.ttl b/examples/saref4agri-ex1.ttl index bf406db734796294aca5e3b7473a4e942ced4d1f..b8c19974dae8e0b991b219bfb01a8c09c8dd86a6 100644 --- a/examples/saref4agri-ex1.ttl +++ b/examples/saref4agri-ex1.ttl @@ -19,7 +19,7 @@ dcterms:license ; dcterms:conformsTo ; dcterms:conformsTo ; - dcterms:conformsTo obo:TAXRANK_0000017, obo:TAXRANK_0000004 , obo:TAXRANK_0000006 , obo:TAXRANK_0000016 , obo:TAXRANK_0000003 ; + # dcterms:conformsTo obo:TAXRANK_0000017, obo:TAXRANK_0000004 , obo:TAXRANK_0000006 , obo:TAXRANK_0000016 , obo:TAXRANK_0000003 ; dcterms:title "SAREF4AGRI example"@en ; dcterms:description "SAREF4AGRI example"@en .