Skip to content

Prevent _work directory mixing in testbench and HPC pipelines #785

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

Open
robin-deltares wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Prevent _work directory mixing in testbench and HPC pipelines #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a7608
Prevent _work directory mixing in testbench and HPC pipelines
robin-deltares Apr 8, 2026
c1bbcd5
Merge branch 'main' into all/task/DEVOPSDSC-000_update_h7_smoke_test_…
robin-deltares Apr 13, 2026
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
10 changes: 9 additions & 1 deletion ci/teamcity/Delft3D/linux/scripts/hpc-smoke/common_utilities.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
# This file contains shared functions used by prepare_all_models.sh and run_all_models.sh

find_dimr_directories() {
find . -type f \( -name "dimr.xml" -o -name "dimr_config.xml" \) -exec dirname {} \; | sort -u
find . -type f \( -name "dimr.xml" -o -name "dimr_config.xml" \) -exec dirname {} \; | sort -u | while read dir; do
dir_name=$(basename "$dir")
parent_dir=$(dirname "$dir")
# Skip non-_work directory when a _work sibling exists (prefer _work for execution)
if [[ "$dir_name" != *_work ]] && [ -d "$parent_dir/${dir_name}_work" ]; then
continue
fi
echo "$dir"
done
}

is_supported_platform() {
Expand Down
6 changes: 5 additions & 1 deletion test/deltares_testbench/src/suite/test_set_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,11 @@ def __process_test_case_locations(self, config: TestCaseConfig, logger: ILogger)
local_path = self.__build_local_path(config, location)
self.__download_location_with_retries(config, location, remote_path, local_path, logger)
if location.type == PathType.INPUT:
self.__copy_to_work_folder(Path(local_path), logger)
work_path = Path(local_path).with_name(f"{Path(local_path).name}_work")
if work_path.exists() and self.settings.command_line_settings.skip_run:
logger.debug(f"Preserving existing work directory: {work_path}")
else:
self.__copy_to_work_folder(Path(local_path), logger)

self.__set_absolute_paths(config, location.type, local_path)

Expand Down
Loading