Skip to content

Commit 895f4a9

Browse files
stefanermensstefanermens
committed
Merge branch 'development' into feature/simulator_data_not_valid
2 parents 12f8847 + a4851bd commit 895f4a9

File tree

79 files changed

+86
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+86
-83
lines changed

‎.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ jobs:
163163
needs: docker
164164
permissions:
165165
checks: write
166+
strategy:
167+
matrix:
168+
values_file: [ci/common-values.yaml, ci/publiclighting-values.yaml]
166169
steps:
167170
- name: Checkout gxf-gitops
168171
uses: actions/checkout@v4
@@ -173,7 +176,7 @@ jobs:
173176
- name: Create gxf platform
174177
run: ./charts/gxf-platform/template-apply.sh --imageTag $(echo -e "${{ needs.docker.outputs.tags }}" | head -n 1 | cut -d':' -f2)
175178
- name: Create and run gxf cucumber tests
176-
run: ./charts/gxf-cucumber-tests/template-apply.sh --imageTag $(echo -e "${{ needs.docker.outputs.tags }}" | head -n 1 | cut -d':' -f2) --valuesFile ci/common-values.yaml
179+
run: ./charts/gxf-cucumber-tests/template-apply.sh --imageTag $(echo -e "${{ needs.docker.outputs.tags }}" | head -n 1 | cut -d':' -f2) --valuesFile ${{ matrix.values_file }}
177180
- name: Wait for jobs to finish
178181
run: kubectl wait --for=condition=complete --all jobs --timeout=30m
179182
- name: Run maven cucumber reporting

‎integration-tests/cucumber-tests-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.17.0-SNAPSHOT</version>
15+
<version>6.18.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

‎integration-tests/cucumber-tests-execution/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.17.0-SNAPSHOT</version>
15+
<version>6.18.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

‎integration-tests/cucumber-tests-platform-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SPDX-License-Identifier: Apache-2.0
1313
<parent>
1414
<groupId>org.opensmartgridplatform</groupId>
1515
<artifactId>parent-integration-tests</artifactId>
16-
<version>6.17.0-SNAPSHOT</version>
16+
<version>6.18.0-SNAPSHOT</version>
1717
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1818
</parent>
1919

‎integration-tests/cucumber-tests-platform-publiclighting/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.17.0-SNAPSHOT</version>
15+
<version>6.18.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

‎integration-tests/cucumber-tests-platform-smartmetering/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SPDX-License-Identifier: Apache-2.0
1414
<parent>
1515
<groupId>org.opensmartgridplatform</groupId>
1616
<artifactId>parent-integration-tests</artifactId>
17-
<version>6.17.0-SNAPSHOT</version>
17+
<version>6.18.0-SNAPSHOT</version>
1818
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1919
</parent>
2020

‎integration-tests/cucumber-tests-platform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.17.0-SNAPSHOT</version>
15+
<version>6.18.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

‎integration-tests/cucumber-tests-protocol-iec60870/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.17.0-SNAPSHOT</version>
15+
<version>6.18.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

‎integration-tests/parent-integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SPDX-License-Identifier: Apache-2.0
1717
<parent>
1818
<groupId>org.opensmartgridplatform</groupId>
1919
<artifactId>super-osgp</artifactId>
20-
<version>6.17.0-SNAPSHOT</version>
20+
<version>6.18.0-SNAPSHOT</version>
2121
<relativePath>../../super/pom.xml</relativePath>
2222
</parent>
2323
<distributionManagement>

‎integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SPDX-License-Identifier: Apache-2.0
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>org.opensmartgridplatform</groupId>
1313
<artifactId>integration-tests</artifactId>
14-
<version>6.17.0-SNAPSHOT</version>
14+
<version>6.18.0-SNAPSHOT</version>
1515
<packaging>pom</packaging>
1616

1717
<properties>

0 commit comments

Comments
 (0)