Skip to content

Commit fe9f2cc

Browse files
author
Rob Tjalma
authored
Merge pull request #71 from com-pas/update-docker-image-2may
Update Docker Image versions (2 May)
2 parents 5678dfc + edd84ee commit fe9f2cc

File tree

7 files changed

+70
-50
lines changed

7 files changed

+70
-50
lines changed

‎.github/workflows/run-integration-tests-basex.yml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,21 @@ jobs:
5252
--network=compas_default \
5353
ppodgorsek/robot-framework:latest
5454
55-
# We need to wait for a new version of the Docker Image.
56-
# There is an issue with Chromium (https://github.com/ppodgorsek/docker-robot-framework/issues/372)
57-
# - name: Created output directory (chromium)
58-
# run: mkdir -p target/chromium
59-
# - name: Execute integration tests (chromium)
60-
# run: |
61-
# docker run --rm -e BROWSER=chromium \
62-
# -e ROBOT_OPTIONS="-v url:http://compas_reverse-proxy_1/" \
63-
# -v $(pwd)/target/firefox:/opt/robotframework/reports:Z \
64-
# -v $(pwd)/integration-testing:/opt/robotframework/tests:Z \
65-
# --user $(id -u):$(id -g) \
66-
# --network=compas_default \
67-
# ppodgorsek/robot-framework:latest
55+
- name: Created output directory (chromium)
56+
run: mkdir -p target/chromium
57+
- name: Execute integration tests (chromium)
58+
# Using the Docker Image from ppodgorsek (https://github.com/ppodgorsek/docker-robot-framework)
59+
# to run the Robot Framework Test Scripts.
60+
# To connect with the Docker Compose and use http://compas_reverse-proxy_1/ as URL we are
61+
# connecting to the same network "compas_default" that's started bij Docker Compose.
62+
run: |
63+
docker run --rm -e BROWSER=chromium \
64+
-e ROBOT_OPTIONS="-v url:http://compas_reverse-proxy_1/" \
65+
-v $(pwd)/target/firefox:/opt/robotframework/reports:Z \
66+
-v $(pwd)/integration-testing:/opt/robotframework/tests:Z \
67+
--user $(id -u):$(id -g) \
68+
--network=compas_default \
69+
ppodgorsek/robot-framework:latest
6870
6971
- name: Archive Robot Framework Reports
7072
if: failure()

‎.github/workflows/run-integration-tests-postgresql.yml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,21 @@ jobs:
5252
--network=compas_default \
5353
ppodgorsek/robot-framework:latest
5454
55-
# We need to wait for a new version of the Docker Image.
56-
# There is an issue with Chromium (https://github.com/ppodgorsek/docker-robot-framework/issues/372)
57-
# - name: Created output directory (chromium)
58-
# run: mkdir -p target/chromium
59-
# - name: Execute integration tests (chromium)
60-
# run: |
61-
# docker run --rm -e BROWSER=chromium \
62-
# -e ROBOT_OPTIONS="-v url:http://compas_reverse-proxy_1/" \
63-
# -v $(pwd)/target/firefox:/opt/robotframework/reports:Z \
64-
# -v $(pwd)/integration-testing:/opt/robotframework/tests:Z \
65-
# --user $(id -u):$(id -g) \
66-
# --network=compas_default \
67-
# ppodgorsek/robot-framework:latest
55+
- name: Created output directory (chromium)
56+
run: mkdir -p target/chromium
57+
- name: Execute integration tests (chromium)
58+
# Using the Docker Image from ppodgorsek (https://github.com/ppodgorsek/docker-robot-framework)
59+
# to run the Robot Framework Test Scripts.
60+
# To connect with the Docker Compose and use http://compas_reverse-proxy_1/ as URL we are
61+
# connecting to the same network "compas_default" that's started bij Docker Compose.
62+
run: |
63+
docker run --rm -e BROWSER=chromium \
64+
-e ROBOT_OPTIONS="-v url:http://compas_reverse-proxy_1/" \
65+
-v $(pwd)/target/firefox:/opt/robotframework/reports:Z \
66+
-v $(pwd)/integration-testing:/opt/robotframework/tests:Z \
67+
--user $(id -u):$(id -g) \
68+
--network=compas_default \
69+
ppodgorsek/robot-framework:latest
6870
6971
- name: Archive Robot Framework Reports
7072
if: failure()

‎RELEASE.md‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,24 @@ For information about CoMPAS go to this [site](https://com-pas.github.io/).
1313
### Release 0.7.0
1414

1515
Next release for testing the CoMPAS System with all components.
16-
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.13.0.0):
16+
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.15.0.0):
17+
- Save as... menu option;
18+
- Rename the name of the SCL File (CoMPAS);
1719
- Small fixes and improvements in editors and wizards;
20+
- See details in [Release notes](https://github.com/openscd/open-scd/releases/tag/v0.15.0);
21+
- [SCL Data Service](https://github.com/com-pas/compas-scl-data-service) (Version 0.9.5):
22+
- Small bugfixes;
23+
- Updated libraries to the latest versions;
24+
- [SCL Auto Alignment Service](https://github.com/com-pas/compas-scl-auto-alignment) (Version 0.2.3):
25+
- Small bugfixes;
26+
- Updated libraries to the latest versions;
27+
- [CIM Mapping Service](https://github.com/com-pas/compas-cim-mapping) (Version 0.8.6):
28+
- Small bugfixes;
29+
- Updated libraries to the latest versions;
30+
- Temporary disabled native image;
31+
- [SCL Validator Service](https://github.com/com-pas/compas-scl-validator) (Version 0.1.4):
32+
- Small bugfixes;
33+
- Updated libraries to the latest versions;
1834

1935
### Release 0.6.0
2036

@@ -59,7 +75,7 @@ Next release for testing the CoMPAS System with all components.
5975
- Loading nsdoc files through settings;
6076
- Add basic wizard for ReportControl;
6177
- Add wizard for sampledvaluecontrol/smv;
62-
- See details in [Release notes](https://github.com/openscd/open-scd/releases/tag/v0.9.0)
78+
- See details in [Release notes](https://github.com/openscd/open-scd/releases/tag/v0.9.0);
6379

6480
### Release 0.2.0
6581

‎compas/docker-compose-basex.yml‎

Lines changed: 5 additions & 5 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.4-basex"
42+
image: "lfenergy/compas-scl-data-service:0.9.5-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.4"
72+
image: "lfenergy/compas-cim-mapping:0.8.6"
7373
ports:
7474
- "9091:8080"
7575
environment:
@@ -93,7 +93,7 @@ services:
9393
scl-auto-alignment:
9494
labels:
9595
compas: true
96-
image: "lfenergy/compas-scl-auto-alignment:0.2.2"
96+
image: "lfenergy/compas-scl-auto-alignment:0.2.3"
9797
ports:
9898
- "9092:8080"
9999
environment:
@@ -117,7 +117,7 @@ services:
117117
scl-validator:
118118
labels:
119119
compas: true
120-
image: "lfenergy/compas-scl-validator:0.1.3"
120+
image: "lfenergy/compas-scl-validator:0.1.4"
121121
ports:
122122
- "9093:8080"
123123
environment:
@@ -144,7 +144,7 @@ services:
144144
open-scd:
145145
labels:
146146
compas: true
147-
image: "lfenergy/compas-open-scd:v0.13.0.2"
147+
image: "lfenergy/compas-open-scd:v0.15.0.0"
148148
healthcheck:
149149
test: ["CMD", "curl", "-f", "http://localhost/"]
150150
interval: 30s

‎compas/docker-compose-postgresql.yml‎

Lines changed: 5 additions & 5 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.4-postgresql"
49+
image: "lfenergy/compas-scl-data-service:0.9.5-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.4"
79+
image: "lfenergy/compas-cim-mapping:0.8.6"
8080
ports:
8181
- "9091:8080"
8282
environment:
@@ -100,7 +100,7 @@ services:
100100
scl-auto-alignment:
101101
labels:
102102
compas: true
103-
image: "lfenergy/compas-scl-auto-alignment:0.2.2"
103+
image: "lfenergy/compas-scl-auto-alignment:0.2.3"
104104
ports:
105105
- "9092:8080"
106106
environment:
@@ -124,7 +124,7 @@ services:
124124
scl-validator:
125125
labels:
126126
compas: true
127-
image: "lfenergy/compas-scl-validator:0.1.3"
127+
image: "lfenergy/compas-scl-validator:0.1.4"
128128
ports:
129129
- "9093:8080"
130130
environment:
@@ -151,7 +151,7 @@ services:
151151
open-scd:
152152
labels:
153153
compas: true
154-
image: "lfenergy/compas-open-scd:v0.13.0.2"
154+
image: "lfenergy/compas-open-scd:v0.15.0.0"
155155
healthcheck:
156156
test: ["CMD", "curl", "-f", "http://localhost/"]
157157
interval: 30s

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ TestCase004-01
5454

5555
Select Tab Single Line Diagram
5656
Select SLD Substation ${substation1}
57-
Check X/Y Coordinates ${substation1VoltageLevel} 36 10
57+
Check X/Y Coordinates ${substation1VoltageLevel} 36 14
5858
Select SLD Substation ${substation3}
5959
Check X/Y Coordinates ${substation3VoltageLevel} 0 0
6060

@@ -73,7 +73,7 @@ TestCase004-02
7373

7474
Select Tab Single Line Diagram
7575
Select SLD Substation ${substation1}
76-
Check X/Y Coordinates ${substation1VoltageLevel} 36 10
76+
Check X/Y Coordinates ${substation1VoltageLevel} 36 14
7777
Select SLD Substation ${substation3}
78-
Check X/Y Coordinates ${substation3VoltageLevel} 12 8
78+
Check X/Y Coordinates ${substation3VoltageLevel} 12 10
7979

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Check Browser Title
4646
Open Menu
4747
[Arguments] ${menuItemTitle}
4848
Click ${menu-selector} mwc-icon-button[label="Menu"] > button
49-
Click ${menu-selector} mwc-list > mwc-list-item >> span:has-text("${menuItemTitle}")
49+
Click ${menu-selector} mwc-list > mwc-list-item >> span:text-is("${menuItemTitle}")
5050

5151
Close Menu
5252
# To make the editors visible again we need to close the menu.
@@ -55,11 +55,11 @@ Close Menu
5555
Sleep 100 milliseconds
5656

5757
Enable Extension
58-
[Arguments] ${extensionName}
59-
Open Menu Extensions
60-
${checkboxState}= Get Element State mwc-list#pluginList > mwc-check-list-item:has-text("${extensionName}") input[type="checkbox"] Checked
61-
IF ${checkboxState} == False
62-
Check Checkbox mwc-list#pluginList > mwc-check-list-item:has-text("${extensionName}") input[type="checkbox"]
58+
[Arguments] ${extensionName}
59+
Open Menu Extensions
60+
${checkboxChecked}= Get Element States mwc-list#pluginList > mwc-check-list-item:has-text("${extensionName}") input[type="checkbox"] *= checked
61+
IF ${checkboxChecked} == False
62+
Check Checkbox mwc-list#pluginList > mwc-check-list-item:has-text("${extensionName}") input[type="checkbox"]
6363
END
6464
# Press the escape key to close the dialog.
6565
Keyboard Key press Escape
@@ -102,7 +102,7 @@ Wait until executed
102102
Wait For Function element => element.className.indexOf('mdc-circular-progress--closed') >= 0 open-scd > mwc-circular-progress-four-color > div[role="progressbar"] timeout=30s
103103

104104
Close Issues Snackbar
105-
${snackbar}= Get Element State mwc-snackbar#issue > mwc-icon-button[slot="dismiss"] > button
106-
IF ${snackbar} == 'visible'
107-
Click mwc-snackbar#issue > mwc-icon-button[slot="dismiss"] > button
105+
${snackbarVisible}= Get Element States mwc-snackbar#issue > mwc-icon-button[slot="dismiss"] > button *= visible
106+
IF ${snackbarVisible} == 'visible'
107+
Click mwc-snackbar#issue > mwc-icon-button[slot="dismiss"] > button
108108
END

0 commit comments

Comments
 (0)