Skip to content

DEVOPSDSC-829 Windows testbenches in container without mounted case folders #416

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 9 commits into
base: main
Choose a base branch
from
Open

DEVOPSDSC-829 Windows testbenches in container without mounted case folders #416

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
284d382
Add deltares_testbench to Windows testbench container and run from th…
robin-deltares Nov 19, 2025
565b54e
Copy test/deltares_testbench to Docker build dir.
robin-deltares Nov 19, 2025
b024b9f
typo
robin-deltares Nov 19, 2025
8d0dad2
Use (now embedded) windows pip requirements location for Docker build.
robin-deltares Dec 2, 2025
66df48a
Fix deltares_testbench path during docker build.
robin-deltares Dec 2, 2025
d61bda1
Mount engines (software) under the new location.
robin-deltares Dec 2, 2025
59e8642
Extract artifacts from container run.
robin-deltares Dec 5, 2025
6800d54
Syntax
robin-deltares Dec 5, 2025
b3c4f46
Excaping Powershell
robin-deltares Dec 5, 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
5 changes: 2 additions & 3 deletions ci/dockerfiles/windows/Dockerfile-dhydro-test-environment
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ RUN Start-Process python-3.12.7-amd64.exe -ArgumentList '/quiet InstallAllUsers=
RUN Remove-Item C:\\python-3.12.7-amd64.exe
RUN New-Item -ItemType SymbolicLink -Path 'C:\\Program Files\\Python312\\python3.exe' -Target 'C:\\Program Files\\Python312\\python.exe'

ADD win-requirements.txt C:\\temp\\win-requirements.txt
ADD deltares_testbench C:\\deltares_testbench

RUN & 'C:\\Program Files\\Python312\\python.exe' -m pip install --upgrade pip; \
& 'C:\\Program Files\\Python312\\python.exe' -m pip install -r C:\\temp\\win-requirements.txt; \
Remove-Item C:\\temp\\win-requirements.txt
& 'C:\\Program Files\\Python312\\python.exe' -m pip install -r C:\\deltares_testbench\\pip\\win-requirements.txt
4 changes: 2 additions & 2 deletions ci/teamcity/Delft3D/windows/test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ object WindowsTest : BuildType({
python {
name = "Run TestBench.py"
id = "RUNNER_testbench"
workingDir = "test/deltares_testbench/"
workingDir = "C:\\deltares_testbench"
command = file {
filename = "TestBench.py"
scriptArguments = """
Expand All @@ -95,7 +95,7 @@ object WindowsTest : BuildType({
dockerImage = "containers.deltares.nl/delft3d-dev/test/delft3d-test-environment-windows:%container.tag%"
dockerImagePlatform = PythonBuildStep.ImagePlatform.Windows
dockerPull = true
dockerRunParameters = "--memory %teamcity.agent.hardware.memorySizeMb%m --cpus %teamcity.agent.hardware.cpuCount%"
dockerRunParameters = "-v %system.teamcity.build.checkoutDir%\\test\\deltares_testbench\\data\\engines:C:\\deltares_testbench\\data\\engines --memory %teamcity.agent.hardware.memorySizeMb%m --cpus %teamcity.agent.hardware.cpuCount%"
}
script {
name = "Copy cases"
Expand Down
2 changes: 1 addition & 1 deletion ci/teamcity/Delft3D/windows/testEnvironment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ object WindowsTestEnvironment : BuildType({

# Copy the files from the source to the destination
Copy-Item -Path "\\directory.intra\project\d-hydro\dsc-tools\toolchain2024\python-3.12.7-amd64.exe" -Destination ${'$'}destinationDir
Copy-Item -Path "test\\deltares_testbench\\pip\\win-requirements.txt" -Destination ${'$'}destinationDir
Copy-Item -Path "test\\deltares_testbench" -Destination ${'$'}destinationDir -Recurse

# List all the files in the destination directory
Get-ChildItem -Path ${'$'}destinationDir
Expand Down