Merge branch 'develop-v2.1.1' into 'issue-3' (38094222) · Commits · SAREF / saref4watr

.gitlab-ci.yml

+3 −82

Original line number	Diff line number	Diff line
		variables:
		GIT_STRATEGY: fetch
		GIT_DEPTH: 0
		SAREF_DEV_KEY: <my_private_key>
		SAREF_PORTAL_KEY: <my_private_key>

		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/-/releases/permalink/latest/downloads/saref-pipeline.jar"
		- java -jar saref-pipeline.jar develop -s && touch target/success
		allow_failure: true
		except:
		- /^prerelease-v/
		- /^release-v/
		artifacts:
		when: always
		paths:
		- target/site
		- target/success
		reports:
		junit: target/report_output.xml

		test-prerelease:
		stage: test
		image: openjdk:11-jre
		script:
		- 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:
		- /^prerelease-v/
		artifacts:
		when: always
		paths:
		- target/site
		- target/success
		reports:
		junit: target/report_output.xml

		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/-/releases/permalink/latest/downloads/saref-pipeline.jar"
		- 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
		include:
		- project: 'saref/saref-core'
		file: '.gitlab-ci.yml'
		No newline at end of file

examples/KPI.ttl

+3 −3

Original line number	Diff line number	Diff line
		@prefix ex: <https://saref.etsi.org/saref4watr/v1.1.1/example/KPI/> .
		@prefix ex: <https://saref.etsi.org/saref4watr/v2.1.1/example/KPI/> .
		@prefix owl: <http://www.w3.org/2002/07/owl#> .
		@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
		@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
		@@ -13,9 +13,9 @@
		@prefix dctype: <http://purl.org/dc/dcmitype/> .
		@prefix dcterms: <http://purl.org/dc/terms/> .

		<https://saref.etsi.org/saref4watr/v1.1.1/example/KPI#> a dctype:Dataset ;
		<https://saref.etsi.org/saref4watr/v2.1.1/example/KPI#> a dctype:Dataset ;
		dcterms:license <https://forge.etsi.org/etsi-software-license> ;
		dcterms:conformsTo <https://saref.etsi.org/saref4watr/v1.1.1/> ;
		dcterms:conformsTo <https://saref.etsi.org/saref4watr/v2.1.1/> ;
		dcterms:title "Example KPI"@en ;
		dcterms:description "Example KPI"@en .

examples/MeterMeasurement.ttl

+3 −3

Original line number	Diff line number	Diff line
		@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .
		@prefix ex: <https://saref.etsi.org/saref4watr/v1.1.1/example/MeterObservation/> .
		@prefix ex: <https://saref.etsi.org/saref4watr/v2.1.1/example/MeterObservation/> .
		@prefix owl: <http://www.w3.org/2002/07/owl#> .
		@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
		@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
		@@ -15,7 +15,7 @@

		<https://saref.etsi.org/saref4watr/v1.1.1/example/MeterObservation#> a dctype:Dataset ;
		dcterms:license <https://forge.etsi.org/etsi-software-license> ;
		dcterms:conformsTo <https://saref.etsi.org/saref4watr/v1.1.1/> ;
		dcterms:conformsTo <https://saref.etsi.org/saref4watr/v2.1.1/> ;
		dcterms:title "Example Meter Observation"@en ;
		dcterms:description "Example Meter Observation"@en .

examples/Tariff.ttl

+3 −3

Original line number	Diff line number	Diff line
		@prefix ex: <https://saref.etsi.org/saref4watr/v1.1.1/example/Tariff/> .
		@prefix ex: <https://saref.etsi.org/saref4watr/v2.1.1/example/Tariff/> .
		@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .
		@prefix owl: <http://www.w3.org/2002/07/owl#> .
		@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
		@@ -13,9 +13,9 @@
		@prefix dctype: <http://purl.org/dc/dcmitype/> .
		@prefix dcterms: <http://purl.org/dc/terms/> .

		<https://saref.etsi.org/saref4watr/v1.1.1/example/Tariff#> a dctype:Dataset ;
		<https://saref.etsi.org/saref4watr/v2.1.1/example/Tariff#> a dctype:Dataset ;
		dcterms:license <https://forge.etsi.org/etsi-software-license> ;
		dcterms:conformsTo <https://saref.etsi.org/saref4watr/v1.1.1/> ;
		dcterms:conformsTo <https://saref.etsi.org/saref4watr/v2.1.1/> ;
		dcterms:title "Example Tariff"@en ;
		dcterms:description "Example Tariff"@en .

examples/WaterInfrastructure.ttl

+3 −3

Original line number	Diff line number	Diff line
		@prefix ex: <https://saref.etsi.org/saref4watr/v1.1.1/example/WaterInfrastructure/> .
		@prefix ex: <https://saref.etsi.org/saref4watr/v2.1.1/example/WaterInfrastructure/> .
		@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .
		@prefix sf: <http://www.opengis.net/ont/sf#> .
		@prefix owl: <http://www.w3.org/2002/07/owl#> .
		@@ -13,9 +13,9 @@
		@prefix dctype: <http://purl.org/dc/dcmitype/> .
		@prefix dcterms: <http://purl.org/dc/terms/> .

		<https://saref.etsi.org/saref4watr/v1.1.1/example/WaterInfrastructure#> a dctype:Dataset ;
		<https://saref.etsi.org/saref4watr/v2.1.1/example/WaterInfrastructure#> a dctype:Dataset ;
		dcterms:license <https://forge.etsi.org/etsi-software-license> ;
		dcterms:conformsTo <https://saref.etsi.org/saref4watr/v1.1.1/> ;
		dcterms:conformsTo <https://saref.etsi.org/saref4watr/v2.1.1/> ;
		dcterms:title "Example WaterInfrastructure"@en ;
		dcterms:description "Example WaterInfrastructure"@en .