Skip to content

Commit e461e1a

Browse files
author
faheem
committed
docker workflow addition, basyx_test updation
1 parent fef852b commit e461e1a

6 files changed

Lines changed: 76 additions & 38 deletions

File tree

‎.github/workflows/basyx_test.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,3 +739,30 @@ jobs:
739739
- name: Stop environment
740740
if: always()
741741
run: docker compose --project-directory ./ci down
742+
743+
744+
test-basyx-digital-twin-registry:
745+
runs-on: ubuntu-latest
746+
name: Digital-Twin-Registry
747+
steps:
748+
- uses: actions/checkout@v4
749+
750+
- name: Set up JDK 17
751+
uses: actions/setup-java@v4
752+
with:
753+
java-version: '17'
754+
distribution: 'adopt'
755+
cache: maven
756+
757+
- name: Build BaSyx
758+
run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
759+
760+
- name: Test DTR component
761+
run: mvn test -f "basyx.digitaltwinregistry.component/pom.xml"
762+
763+
- name: Fail if no Surefire reports found
764+
run: |
765+
if ! find . -type f -path "*/target/surefire-reports/*.xml" | grep -q .; then
766+
echo "No Surefire test reports found. Failing CI.";
767+
exit 1;
768+
fi

‎.github/workflows/docker-milestone-release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ jobs:
4343
path: basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker
4444
- name: submodel-registry-log-mongodb
4545
path: basyx.submodelregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker
46+
- name: aas-digital-twin-registry
47+
path: basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component
4648

4749
steps:
4850
- name: Checkout Code

‎.github/workflows/docker-snapshot-release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ jobs:
5959
path: basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker
6060
- name: submodel-registry-log-mongodb
6161
path: basyx.submodelregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker
62+
- name: aas-digital-twin-registry
63+
path: basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component
6264

6365
steps:
6466
- name: Checkout Code

‎basyx.aasdigitaltwinregistry/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
<version>${revision}</version>
1111
</parent>
1212

13+
<properties>
14+
<java.version>17</java.version>
15+
<maven.compiler.source>${java.version}</maven.compiler.source>
16+
<maven.compiler.target>${java.version}</maven.compiler.target>
17+
<skipTests>false</skipTests>
18+
<maven.test.skip>false</maven.test.skip>
19+
</properties>
20+
1321
<artifactId>basyx.digitaltwinregistry</artifactId>
1422
<name>BaSyx Digital Twin Registry</name>
1523
<description>BaSyx Digital Twin Registry</description>

‎basyx.aasdiscoveryservice/basyx.aasdiscoveryservice-client/src/main/java/org/eclipse/digitaltwin/basyx/aasdiscoveryservice/client/internal/AssetAdministrationShellDiscoveryApi.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ public List<SpecificAssetId> postAllAssetLinksById(String aasIdentifier, List<Sp
190190
byte[] body = objectMapper.writeValueAsBytes(assetIds);
191191
builder.method("POST", HttpRequest.BodyPublishers.ofByteArray(body));
192192
} catch (IOException e) {
193-
log.debug(""+e.getLocalizedMessage());
194193
throw new ApiException(e);
195194
}
196195

‎basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/src/main/resources/application.properties‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
#server.port=8081
2-
#spring.application.name=AAS Discovery Service
3-
#basyx.aasdiscoveryservice.name=aas-discovery-service
4-
#
5-
#basyx.backend=InMemory
6-
##spring.h2.console.enabled=true
7-
##spring.h2.console.path=/h2-console
8-
#
9-
##basyx.backend=MongoDB
10-
##spring.data.mongodb.host=127.0.0.1
11-
###or spring.data.mongodb.host=127.0.0.1
12-
##spring.data.mongodb.port=27017
13-
##spring.data.mongodb.database=concepts
14-
##spring.data.mongodb.authentication-database=admin
15-
##spring.data.mongodb.username=mongoAdmin
16-
##spring.data.mongodb.password=mongoPassword
17-
##basyx.aasdiscoveryservice.mongodb.collectionName=aasdiscovery-service
18-
#
19-
##alternative
20-
##spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/?authMechanism=DEFAULT
21-
#
22-
## basyx.cors.allowed-origins=http://localhost:3000, http://localhost:4000
23-
#
24-
#####################################################################################
25-
## Authorization
26-
#####################################################################################
27-
##basyx.feature.authorization.enabled = true
28-
##basyx.feature.authorization.type = rbac
29-
##basyx.feature.authorization.jwtBearerTokenProvider = keycloak
30-
##basyx.feature.authorization.rbac.file = classpath:rbac_rules.json
31-
##spring.security.oauth2.resourceserver.jwt.issuer-uri= http://localhost:9096/realms/BaSyx
32-
#
33-
#####################################################################################
34-
## Disable the Swagger UI
35-
#####################################################################################
36-
##springdoc.swagger-ui.enabled=false
37-
##springdoc.api-docs.enabled=false
1+
server.port=8081
2+
spring.application.name=AAS Discovery Service
3+
basyx.aasdiscoveryservice.name=aas-discovery-service
4+
5+
basyx.backend=InMemory
6+
#spring.h2.console.enabled=true
7+
#spring.h2.console.path=/h2-console
8+
9+
#basyx.backend=MongoDB
10+
#spring.data.mongodb.host=127.0.0.1
11+
##or spring.data.mongodb.host=127.0.0.1
12+
#spring.data.mongodb.port=27017
13+
#spring.data.mongodb.database=concepts
14+
#spring.data.mongodb.authentication-database=admin
15+
#spring.data.mongodb.username=mongoAdmin
16+
#spring.data.mongodb.password=mongoPassword
17+
#basyx.aasdiscoveryservice.mongodb.collectionName=aasdiscovery-service
18+
19+
#alternative
20+
#spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/?authMechanism=DEFAULT
21+
22+
# basyx.cors.allowed-origins=http://localhost:3000, http://localhost:4000
23+
24+
####################################################################################
25+
# Authorization
26+
####################################################################################
27+
#basyx.feature.authorization.enabled = true
28+
#basyx.feature.authorization.type = rbac
29+
#basyx.feature.authorization.jwtBearerTokenProvider = keycloak
30+
#basyx.feature.authorization.rbac.file = classpath:rbac_rules.json
31+
#spring.security.oauth2.resourceserver.jwt.issuer-uri= http://localhost:9096/realms/BaSyx
32+
33+
####################################################################################
34+
# Disable the Swagger UI
35+
####################################################################################
36+
#springdoc.swagger-ui.enabled=false
37+
#springdoc.api-docs.enabled=false

0 commit comments

Comments
 (0)