From 03436e2d1b1d2e5cac529a84d25bb1b3e5a1b212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Wed, 20 Mar 2024 14:44:57 +0000 Subject: [PATCH 1/5] bug in the domain and range of isValueOfProperty --- ontology/saref.ttl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ontology/saref.ttl b/ontology/saref.ttl index 859793f..329e8c3 100644 --- a/ontology/saref.ttl +++ b/ontology/saref.ttl @@ -946,8 +946,8 @@ saref:hasPropertyValue saref:isValueOfProperty a owl:ObjectProperty ; rdfs:label "is value of property"@en ; rdfs:comment "Links a property value to the property or property of interest it is a value of."@en ; - rdfs:domain [ a owl:Class ; owl:unionOf ( saref:FeatureKind saref:FeatureOfInterest saref:PropertyOfInterest ) ] ; - rdfs:range saref:PropertyValue ; + rdfs:domain saref:PropertyValue ; + rdfs:range [ a owl:Class ; owl:unionOf ( saref:Property saref:PropertyOfInterest ) ] ; skos:historyNote "V3.2.1: Introduced saref:isValueOfProperty."@en . -- GitLab From 8ed43bb7e4afcecde3f5b8b402b6b22a50855fbd Mon Sep 17 00:00:00 2001 From: Maxime Date: Mon, 29 Apr 2024 13:09:03 +0200 Subject: [PATCH 2/5] close #52 --- ontology/saref.ttl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ontology/saref.ttl b/ontology/saref.ttl index 329e8c3..0e2eb23 100644 --- a/ontology/saref.ttl +++ b/ontology/saref.ttl @@ -1509,14 +1509,14 @@ saref:isCommandOf a owl:ObjectProperty ; rdfs:range [ a owl:Class ; owl:unionOf ( saref:Function saref:FunctionOfInterest ) ] . saref:hasMandatoryCommand a owl:ObjectProperty ; - owl:subPropertyOf saref:hasCommand ; + rdfs:subPropertyOf saref:hasCommand ; rdfs:label "has mandatory command"@en ; rdfs:comment "Links a function and one of its mandatory commands"@en ; rdfs:domain saref:Function ; skos:historyNote "V3.2.1: Introduced mandatory and optional commands."@en . saref:hasOptionalCommand a owl:ObjectProperty ; - owl:subPropertyOf saref:hasCommand ; + rdfs:subPropertyOf saref:hasCommand ; rdfs:label "has optional command"@en ; rdfs:comment "Links a function and one of its optional commands"@en ; rdfs:domain saref:Function . @@ -1579,7 +1579,7 @@ saref:isCommandOfInterestOf a owl:ObjectProperty , owl:FunctionalProperty ; rdfs:comment "Links a command of interest to the function of interest it is a command of."@en ; rdfs:label "is command of interest of"@en ; rdfs:domain saref:CommandOfInterest ; - rdfs:range saref:FeatureOfInterest . + rdfs:range saref:FunctionOfInterest . ## A command of interest is the command of (OP saref:isCommandOfInterestOf) exactly one function of interest. -- GitLab From 583aa4b2126751ae169d60eff17d812ffc1c52c7 Mon Sep 17 00:00:00 2001 From: Maxime Date: Tue, 14 May 2024 10:26:52 +0200 Subject: [PATCH 3/5] test new port --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a36a00..85eedfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ variables: GIT_DEPTH: 0 SAREF_DEV_KEY: SAREF_PORTAL_KEY: + SAREF_PORT: stages: - test @@ -55,7 +56,7 @@ deploy-report: - 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 + - scp -P $SAREF_PORT -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: -- GitLab From 0d348605642e39a6af8ea3b3ee197f140da1ed8c Mon Sep 17 00:00:00 2001 From: Miguel Angel Reina Ortega Date: Wed, 22 May 2024 14:48:39 +0000 Subject: [PATCH 4/5] Adding saref.etsi.org to hosts --- .gitlab-ci.yml | 167 +++++++++++++++++++++++++------------------------ 1 file changed, 84 insertions(+), 83 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85eedfb..9b38b72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,83 +1,84 @@ -variables: - GIT_STRATEGY: fetch - GIT_DEPTH: 0 - SAREF_DEV_KEY: - SAREF_PORTAL_KEY: - SAREF_PORT: - -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 $SAREF_PORT -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 +variables: + GIT_STRATEGY: fetch + GIT_DEPTH: 0 + SAREF_DEV_KEY: + SAREF_PORTAL_KEY: + SAREF_PORT: + +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 + - echo "172.29.10.32 saref.etsi.org" >> /etc/hosts + - 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 $SAREF_PORT -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 -- GitLab From 781f46b8ed1acdf5b50adb82684bd93412a58734 Mon Sep 17 00:00:00 2001 From: Miguel Angel Reina Ortega Date: Wed, 22 May 2024 15:03:46 +0000 Subject: [PATCH 5/5] Force use of SCP protocol --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b38b72..061e8b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,7 @@ deploy-report: - ssh-add <(echo "$SAREF_DEV_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - - scp -P $SAREF_PORT -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID + - scp -P $SAREF_PORT -O -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: -- GitLab