Merge branch 'develop-v1.1.2' into release-v1.1.2 (9329bab8) · Commits · SAREF / saref4bldg

.gitlab-ci.yml

+3 −77

Original line number	Diff line number	Diff line
		image: openjdk:8-jdk

		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://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
		- 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
		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"
		- 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
		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/

		test-release:
		stage: test
		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"
		- 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/example1BLDG.ttl

+16 −16

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		@prefix s4bldg: <https://saref.etsi.org/saref4bldg/> .
		@prefix s4ener: <https://saref.etsi.org/saref4ener/> .
		@prefix dcterms: <http://purl.org/dc/terms/> .
		@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
		@prefix wgs84: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
		@prefix time: <http://www.w3.org/2006/time#> .
		@prefix wurvoc: <http://www.wurvoc.org/vocabularies/om-1.8/> .
		@prefix dctype: <http://purl.org/dc/dcmitype/> .
		@@ -24,9 +24,9 @@
		dcterms:title "Example of use for the SAREF extension for building devices"@en ;
		dcterms:description "Example of use for the SAREF extension for building devices"@en .

		geo:SpatialThing a owl:Class .
		geo:long a owl:DatatypeProperty .
		geo:lat a owl:DatatypeProperty .
		wgs84:SpatialThing a owl:Class .
		wgs84:long a owl:DatatypeProperty .
		wgs84:lat a owl:DatatypeProperty .


		:Compressor001SIERRA02-0434C3 rdf:type owl:NamedIndividual ,
		@@ -36,7 +36,7 @@ geo:lat a owl:DatatypeProperty .
		s4bldg:impellerDiameter :ImpellerDiameterCompressor001SIERRA02-0434C3 ;
		s4bldg:isContainedIn :RefrigerationStoreComputerScienceBuilding1 ;
		s4bldg:nominalCapacity :NominalCapacityCompressor001SIERRA02-0434C3 ;
		geo:location :LocationCompressor001SIERRA02-0434C3 ;
		wgs84:location :LocationCompressor001SIERRA02-0434C3 ;
		s4ener:exposes :PowerProfileCompressor001SIERRA02-0434C3 ;
		s4bldg:hasHotGasBypass "false"^^xsd:boolean ;
		s4bldg:powerSource "MotorDriven"^^xsd:string ;
		@@ -55,7 +55,7 @@ geo:lat a owl:DatatypeProperty .

		:ComputerScienceBuilding1 rdf:type owl:NamedIndividual ,
		s4bldg:Building ;
		geo:location :LocationComputerScienceBuilding1 ;
		wgs84:location :LocationComputerScienceBuilding1 ;
		rdfs:label "Computer Science Building 1"@en .


		@@ -74,23 +74,23 @@ geo:lat a owl:DatatypeProperty .


		:LocationCompressor001SIERRA02-0434C3 rdf:type owl:NamedIndividual ,
		geo:SpatialThing ;
		geo:lat "40.405155" ;
		geo:long "-3.839203" ;
		wgs84:SpatialThing ;
		wgs84:lat "40.405155" ;
		wgs84:long "-3.839203" ;
		rdfs:label "Location of compressor001 SIERRA02-0434C3"@en .


		:LocationComputerScienceBuilding1 rdf:type owl:NamedIndividual ,
		geo:SpatialThing ;
		geo:lat "40.405013" ;
		geo:long "-3.839349" ;
		wgs84:SpatialThing ;
		wgs84:lat "40.405013" ;
		wgs84:long "-3.839349" ;
		rdfs:label "Location of Computer Science Building 1"@en .


		:LocationRefrigerationStoreComputerScienceBuilding1 rdf:type owl:NamedIndividual ,
		geo:SpatialThing ;
		geo:lat "40.405152" ;
		geo:long "-3.839209" ;
		wgs84:SpatialThing ;
		wgs84:lat "40.405152" ;
		wgs84:long "-3.839209" ;
		rdfs:label "LocationRefrigerationStoreComputerScienceBuilding1"@en .


		@@ -117,7 +117,7 @@ geo:lat a owl:DatatypeProperty .
		:RefrigerationStoreComputerScienceBuilding1 rdf:type owl:NamedIndividual ,
		s4bldg:BuildingSpace ;
		s4bldg:isSpaceOf :ComputerScienceBuilding1 ;
		geo:location :LocationRefrigerationStoreComputerScienceBuilding1 ;
		wgs84:location :LocationRefrigerationStoreComputerScienceBuilding1 ;
		rdfs:label "Refrigeration store of Computer Science Building 1"@en .