Skip to content

feat: add automatic postprocessing of integratedTestsLogs. #3509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 12, 2025
Merged

feat: add automatic postprocessing of integratedTestsLogs. #3509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
01f23ad
feat: add automatic postprocessing of integratedTestsLogs.
CusiniM Jan 7, 2025
52c8c49
change pythonPackages branch.
CusiniM Jan 8, 2025
8b4b044
TEST: add new wrapper.
CusiniM Jan 10, 2025
bdc04c6
Merge branch 'develop' into feat/cusini/autoMaticProcessingOfTestsLogs
CusiniM Jan 10, 2025
1506ca6
fix compilation error.
CusiniM Jan 10, 2025
9fa9f9a
Merge branch 'feat/cusini/autoMaticProcessingOfTestsLogs' of github.c…
CusiniM Jan 10, 2025
cd4f923
Move the location of the script back.
CusiniM Jan 11, 2025
e55a3e5
revert unwanted changes.
CusiniM Jan 11, 2025
8178c36
revert change.
CusiniM Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions scripts/ci_build_and_test_in_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,11 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then

echo "Running integrated tests..."
integratedTests/geos_ats.sh --baselineCacheDirectory /tmp/geos/baselines
echo "Processing logs..."
bin/geos_ats_process_tests_fails --directory integratedTests/TestResults &> integratedTests/TestResults/processedTestsLogs.txt
echo "Packing logs..."
tar -czf ${DATA_EXCHANGE_DIR}/test_logs_${DATA_BASENAME_WE}.tar.gz integratedTests/TestResults

echo "Checking results..."
bin/geos_ats_log_check integratedTests/TestResults/test_results.ini -y ${GEOS_SRC_DIR}/.integrated_tests.yaml &> $tempdir/log_check.txt
cat $tempdir/log_check.txt
Expand All @@ -315,7 +318,7 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
INTEGRATED_TEST_EXIT_STATUS=0
else
echo "IntegratedTests failed. Rebaseline is required."

# Rebaseline and pack into an archive
echo "Rebaselining..."
integratedTests/geos_ats.sh -a rebaselinefailed
Expand Down
94 changes: 0 additions & 94 deletions scripts/processIntegratedTestCheckFailures.py
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions scripts/setupPythonEnvironment.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ declare -a LINK_SCRIPTS=("preprocess_xml"
"geos_ats_log_check"
"geos_ats_restart_check"
"geos_ats_curve_check"
"geos_ats_process_tests_fails"
"mesh-doctor"
"activate"
"python")
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd
################################
# Add python environment setup
################################
# message(WARNING "Temporarily changing the geosPythonBranch to bugfix/sherman/fixNumpyProd")
# set(GEOS_PYTHON_PACKAGES_BRANCH "bugfix/sherman/fixNumpyProd" CACHE STRING "" FORCE)
# message(WARNING "Temporarily changing the geosPythonBranch to cusini/addFailedTestsLogProcessing")
# set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/addFailedTestsLogProcessing" CACHE STRING "" FORCE)


if ( Python3_EXECUTABLE )
Expand Down
Loading