Merge branch 'main' into doc/powermeter_error_handling

.ci/build-kit/docker/Dockerfile

@@ -1,3 +1,12 @@
 # syntax=docker/dockerfile:1
 ARG BASE_IMAGE_TAG=latest
 FROM ghcr.io/everest/everest-ci/build-kit-base:${BASE_IMAGE_TAG}
+
+# Can be used to use an other version of everest-cmake
+# ENV EVEREST_CMAKE_PATH=/usr/lib/cmake/everest-cmake
+# ENV EVEREST_CMAKE_VERSION=<everest-cmake-verion>
+# RUN rm -rf ${EVEREST_CMAKE_PATH} \
+#     && git clone https://github.com/EVerest/everest-cmake.git ${EVEREST_CMAKE_PATH} \
+#     && cd ${EVEREST_CMAKE_PATH} \
+#     && git checkout ${EVEREST_CMAKE_VERSION} \
+#     && rm -r .git

.ci/build-kit/scripts/compile.sh

@@ -1,16 +1,24 @@
 #!/bin/sh
 
-set -e
-
 cmake \
     -B "$EXT_MOUNT/build" \
     -S "$EXT_MOUNT/source" \
     -G Ninja \
     -DEVC_ENABLE_CCACHE=1 \
     -DISO15118_2_GENERATE_AND_INSTALL_CERTIFICATES=OFF \
     -DCMAKE_INSTALL_PREFIX="$EXT_MOUNT/dist" \
-    -DWHEEL_INSTALL_PREFIX="$EXT_MOUNT/dist-wheels" \
+    -DWHEEL_INSTALL_PREFIX="$EXT_MOUNT/wheels" \
     -DBUILD_TESTING=ON \
     -DEVEREST_ENABLE_COMPILE_WARNINGS=ON
+retVal=$?
+if [ $retVal -ne 0 ]; then
+    echo "Configuring failed with return code $retVal"
+    exit $retVal
+fi
 
-ninja -j$(nproc) -C "$EXT_MOUNT/build"
+ninja -C "$EXT_MOUNT/build"
+retVal=$?
+if [ $retVal -ne 0 ]; then
+    echo "Compiling failed with return code $retVal"
+    exit $retVal
+fi

.ci/build-kit/scripts/create_integration_image.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+rsync -a "$EXT_MOUNT/source/tests" ./
+retVal=$?
+
+if [ $retVal -ne 0 ]; then
+    echo "Failed to copy tests"
+    exit $retVal
+fi
+
+pip install --break-system-packages \
+    $EXT_MOUNT/wheels/everestpy-*.whl \
+    $EXT_MOUNT/wheels/everest_testing-*.whl \
+    pytest-html
+retVal=$?
+
+if [ $retVal -ne 0 ]; then
+    echo "Failed to pip-install"
+    exit $retVal
+fi

.ci/build-kit/scripts/create_ocpp_tests_image.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+rsync -a "$EXT_MOUNT/source/tests" ./
+retVal=$?
+
+if [ $retVal -ne 0 ]; then
+    echo "Failed to copy tests"
+    exit $retVal
+fi
+
+pip install --break-system-packages \
+    "$EXT_MOUNT"/wheels/everestpy-*.whl \
+    "$EXT_MOUNT"/wheels/everest_testing-*.whl \
+    "$EXT_MOUNT"/wheels/iso15118-*.whl \
+    pytest-html
+retVal=$?
+
+if [ $retVal -ne 0 ]; then
+    echo "Failed to pip-install"
+    exit $retVal
+fi
+
+pip install --break-system-packages -r tests/ocpp_tests/requirements.txt
+
+$(cd ./tests/ocpp_tests/test_sets/everest-aux/ && ./install_certs.sh "$EXT_MOUNT/dist" && ./install_configs.sh "$EXT_MOUNT/dist")

.ci/build-kit/scripts/install.sh

@@ -1,8 +1,9 @@
 #!/bin/sh
 
-set -e
-
 ninja -C "$EXT_MOUNT/build" install
-ninja -C "$EXT_MOUNT/build" everestpy_install_wheel
-ninja -C "$EXT_MOUNT/build" everest-testing_install_wheel
-ninja -C "$EXT_MOUNT/build" iso15118_install_wheel
+retVal=$?
+
+if [ $retVal -ne 0 ]; then
+    echo "Installation failed with return code $retVal"
+    exit $retVal
+fi

.ci/build-kit/scripts/install_wheels.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+ninja -C "$EXT_MOUNT/build" \
+    everestpy_install_wheel \
+    everest-testing_install_wheel \
+    iso15118_install_wheel
+retVal=$?
+
+if [ $retVal -ne 0 ]; then
+    echo "Wheel Installation failed with return code $retVal"
+    exit $retVal
+fi

.ci/build-kit/scripts/run_unit_tests.sh

@@ -1,7 +1,14 @@
 #!/bin/sh
 
-set -e
+ninja -C "$EXT_MOUNT/build" test
+retVal=$?
 
-trap "cp $EXT_MOUNT/build/Testing/Temporary/LastTest.log $EXT_MOUNT/ctest-report" EXIT
+# Copy the LastTest.log file to the mounted directory in any case
+cp "$EXT_MOUNT/build/Testing/Temporary/LastTest.log" "$EXT_MOUNT/ctest-report"
 
-ninja -C "$EXT_MOUNT/build" test
+if [ $retVal -ne 0 ]; then
+    echo "Unit tests failed with return code $retVal"
+    exit $retVal
+fi
+
+set -e

.ci/e2e/scripts/run_integration_tests.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-set -e
-
 cd tests
 pytest \
   -rA \
@@ -11,3 +9,9 @@ pytest \
   core_tests/*.py \
   framework_tests/*.py \
   --everest-prefix "$EXT_MOUNT/dist"
+retVal=$?
+
+if [ $retVal -ne 0 ]; then
+    echo "Integration tests failed with return code $retVal"
+    exit $retVal
+fi

.ci/e2e/scripts/run_ocpp_tests.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+cd tests
+
+PARALLEL_TESTS=$(nproc)
+
+echo "Running $PARALLEL_TESTS ocpp tests in parallel"
+
+pytest \
+  -rA \
+  -d --tx "$PARALLEL_TESTS"*popen//python=python3 \
+  --max-worker-restart=0 \
+  --timeout=300 \
+  --junitxml="$EXT_MOUNT/ocpp-tests-result.xml" \
+  --html="$EXT_MOUNT/ocpp-tests-report.html" \
+  --self-contained-html \
+  ocpp_tests/test_sets/ocpp16/*.py \
+  ocpp_tests/test_sets/ocpp201/*.py \
+  --everest-prefix "$EXT_MOUNT/dist"
+retVal=$?
+
+if [ $retVal -ne 0 ]; then
+    echo "OCPP tests failed with return code $retVal"
+    exit $retVal
+fi

.github/CODEOWNERS

@@ -22,26 +22,28 @@
 /modules/EnergyNode/ @corneliusclaussen @hikinggrass @pietfried
 /modules/EvseManager/ @corneliusclaussen @SebaLukas @hikinggrass @pietfried
 /modules/EvManager/ @SebaLukas @pietfried @MarzellT
+/modules/Evse15118D20/ @SebaLukas @a-w50 @corneliusclaussen
 /modules/EvseSecurity/ @AssemblyJohn @pietfried @hikinggrass
 /modules/EvseV2G/ @corneliusclaussen @SebaLukas @james-ctc
 /modules/EvseSlac/ @a-w50 @corneliusclaussen @SebaLukas
 /modules/OCPP/ @hikinggrass @pietfried @maaikez
 /modules/OCPP201/ @hikinggrass @pietfried @maaikez
 /modules/PacketSniffer @corneliusclaussen @SebaLukas @hikinggrass
+/modules/PhyVersoBSP @pietfried @hikinggrass @corneliusclaussen @dorezyuk @rckstrh
 /modules/PyEvJosev @SebaLukas @corneliusclaussen @pietfried
 /modules/Setup @hikinggrass @corneliusclaussen @pietfried
 /modules/YetiDriver @corneliusclaussen @hikinggrass
 /modules/simulation/ @SebaLukas @pietfried @hikinggrass
 /modules/SlacSimulator/ @SebaLukas @pietfried @corneliusclaussen @MarzellT
-/modules/rust_examples/ @SirVer @golovasteek @dorezyuk
-**/Cargo.toml @SirVer @golovasteek @dorezyuk
-**/Cargo.lock @SirVer @golovasteek @dorezyuk
+/modules/rust_examples/ @SirVer @dorezyuk
+**/Cargo.toml @SirVer @dorezyuk @pietfried @hikinggrass
+**/Cargo.lock @SirVer @dorezyuk @pietfried @hikinggrass
 
 
 # Rust & Bazel
-*.rs @SirVer @golovasteek @dorezyuk
-*.bazel @SirVer @golovasteek @dorezyuk
-*.bzl @SirVer @golovasteek @dorezyuk
+*.rs @SirVer @dorezyuk @pietfried @hikinggrass
+*.bazel @SirVer @dorezyuk @pietfried @hikinggrass
+*.bzl @SirVer @dorezyuk @pietfried @hikinggrass
 
 # third-party/bazel
-/third-party/bazel/deps_versions.bzl @pietfried @hikinggrass @corneliusclaussen @SebaLukas @a-w50 @SirVer @golovasteek @dorezyuk
+/third-party/bazel/deps_versions.bzl @pietfried @hikinggrass @corneliusclaussen @SebaLukas @a-w50 @SirVer @dorezyuk