Skip to content

Commit c1936a5

Browse files
author
Dennis Labordus
authored
Merge pull request #81 from com-pas/update-docker-image-30jun-1
Update Docker Image versions + Robot Tests
2 parents 672216a + a53cf0f commit c1936a5

File tree

6 files changed

+40
-18
lines changed

6 files changed

+40
-18
lines changed

‎RELEASE.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,25 @@ For information about CoMPAS go to this [site](https://com-pas.github.io/).
1010

1111
## Release notes
1212

13+
### Release 0.9.0
14+
15+
Next release for testing the CoMPAS System with all components.
16+
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.19.0.0):
17+
- Show Who/When/What information for the versions in CoMPAS;
18+
- See details in [Release notes (V0.19.0.0)](https://github.com/openscd/open-scd/releases/tag/v0.19.0);
19+
- See details in [Release notes (V0.18.0.0)](https://github.com/openscd/open-scd/releases/tag/v0.18.0);
20+
- [SCL Data Service](https://github.com/com-pas/compas-scl-data-service) (Version 0.9.9):
21+
- Return Who/When/What information when returning versions;
22+
- Updated libraries to the latest versions;
23+
- [SCL Auto Alignment Service](https://github.com/com-pas/compas-scl-auto-alignment) (Version 0.2.5):
24+
- Updated libraries to the latest versions;
25+
- [CIM Mapping Service](https://github.com/com-pas/compas-cim-mapping) (Version 0.9.0):
26+
- Upgrade to JDK 17;
27+
- Updated libraries to the latest versions;
28+
- [SCL Validator Service](https://github.com/com-pas/compas-scl-validator) (Version 0.3.0):
29+
- Latest OCL Rules for SCL from RiseClipse are included;
30+
- Updated libraries to the latest versions;
31+
1332
### Release 0.8.0
1433

1534
Next release for testing the CoMPAS System with all components.

‎compas/docker-compose-basex.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ services:
3939
scl-data-service:
4040
labels:
4141
compas: true
42-
image: "lfenergy/compas-scl-data-service:0.9.8-basex"
42+
image: "lfenergy/compas-scl-data-service:0.9.9-basex"
4343
ports:
4444
- "9090:8080"
4545
environment:
@@ -69,7 +69,7 @@ services:
6969
cim-mapping:
7070
labels:
7171
compas: true
72-
image: "lfenergy/compas-cim-mapping:0.8.8"
72+
image: "lfenergy/compas-cim-mapping:0.9.0"
7373
ports:
7474
- "9091:8080"
7575
environment:
@@ -144,7 +144,7 @@ services:
144144
open-scd:
145145
labels:
146146
compas: true
147-
image: "lfenergy/compas-open-scd:v0.17.0.1"
147+
image: "lfenergy/compas-open-scd:v0.19.0.0"
148148
healthcheck:
149149
test: ["CMD", "curl", "-f", "http://localhost/"]
150150
interval: 30s

‎compas/docker-compose-postgresql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
scl-data-service:
4747
labels:
4848
compas: true
49-
image: "lfenergy/compas-scl-data-service:0.9.8-postgresql"
49+
image: "lfenergy/compas-scl-data-service:0.9.9-postgresql"
5050
ports:
5151
- "9090:8080"
5252
environment:
@@ -76,7 +76,7 @@ services:
7676
cim-mapping:
7777
labels:
7878
compas: true
79-
image: "lfenergy/compas-cim-mapping:0.8.8"
79+
image: "lfenergy/compas-cim-mapping:0.9.0"
8080
ports:
8181
- "9091:8080"
8282
environment:
@@ -151,7 +151,7 @@ services:
151151
open-scd:
152152
labels:
153153
compas: true
154-
image: "lfenergy/compas-open-scd:v0.17.0.1"
154+
image: "lfenergy/compas-open-scd:v0.19.0.0"
155155
healthcheck:
156156
test: ["CMD", "curl", "-f", "http://localhost/"]
157157
interval: 30s

‎integration-testing/TestSuite002-versions-compas.robot‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ Resource ./include/general-compas.robot
99
Test Setup Initialize and Start OpenSCD
1010
Test Teardown Make screenshot and Stop OpenSCD
1111

12+
*** Variables ***
13+
# Variables of Selectors commonly used.
14+
${compas-versions-editor-selector} oscd-plugin932e8e83a469de68
15+
1216
*** Keywords ***
1317
Upload new version
1418
[Arguments] ${changeType} ${name} ${type}
@@ -42,6 +46,7 @@ Initialize Versions
4246
IF ${create-multiple-versions} == True
4347
Open Menu Save project
4448
Update in CoMPAS MAJOR ${sclname} ${scltype} 2.0.0
49+
Select Tab CoMPAS Versions
4550
Get Element Count ${compas-versions-editor-selector} mwc-list > mwc-check-list-item == 2
4651
END
4752

‎integration-testing/TestSuite004-auto-alignment.robot‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ Test Setup Initialize and Start OpenSCD
1010
Test Teardown Make screenshot and Stop OpenSCD
1111

1212
*** Variables ***
13-
${substation1} _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4
14-
${substation1VoltageLevel} ${substation1}>S1 110kV
15-
${substation3} _974565b1-ac55-4901-9f48-afc7ef5486df
16-
${substation3VoltageLevel} ${substation3}>S3 110kV
13+
${single-line-diagram-selector} oscd-plugin631642fb644970bc
14+
15+
${substation1} _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4
16+
${substation1VoltageLevel} ${substation1}>S1 110kV
17+
${substation3} _974565b1-ac55-4901-9f48-afc7ef5486df
18+
${substation3VoltageLevel} ${substation3}>S3 110kV
1719

1820
*** Keywords ***
1921
Execute SCL Auto Alignment
@@ -29,14 +31,14 @@ Execute SCL Auto Alignment
2931
Select SLD Substation
3032
[Arguments] ${id}
3133
# First click on the selectbox to open the dropdown box, to make the values visible.
32-
Click single-line-diagram-plugin mwc-select[id="substationSelector"]
34+
Click ${single-line-diagram-selector} mwc-select[id="substationSelector"]
3335
# Now we can select the correct substation.
34-
Click single-line-diagram-plugin mwc-select[id="substationSelector"] > mwc-list-item[value="${id}"]
36+
Click ${single-line-diagram-selector} mwc-select[id="substationSelector"] > mwc-list-item[value="${id}"]
3537

3638
Check X/Y Coordinates
3739
[Arguments] ${id} ${x} ${y}
38-
Get Attribute single-line-diagram-plugin svg g[id="${id}"] sxy:x == ${x}
39-
Get Attribute single-line-diagram-plugin svg g[id="${id}"] sxy:y == ${y}
40+
Get Attribute ${single-line-diagram-selector} svg g[id="${id}"] sxy:x == ${x}
41+
Get Attribute ${single-line-diagram-selector} svg g[id="${id}"] sxy:y == ${y}
4042

4143
*** Test Cases ***
4244
TestCase004-01

‎integration-testing/include/general-compas.robot‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ Documentation Generic variables and Keywords to work with the OpenSCD CoMPAS C
77
Resource ./general-config.robot
88
Resource ./general-openscd.robot
99

10-
*** Variables ***
11-
# Variables of Selectors commonly used.
12-
${compas-versions-editor-selector} compas-versions-plugin
13-
1410
*** Keywords ***
1511
Open from CoMPAS
1612
[Arguments] ${name} ${type} ${expectedVersion}

0 commit comments

Comments
 (0)