Skip to content

All/task/devopsdsc 777 nexus collect upload #395

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
BartSteurDeltares wants to merge 34 commits into
base: main
Choose a base branch
from
Open

All/task/devopsdsc 777 nexus collect upload #395

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c9ae580
create artifacts tarball
BartSteurDeltares Nov 10, 2025
3b25846
add step to upload to nexus
BartSteurDeltares Nov 10, 2025
f3a726a
add context params
BartSteurDeltares Nov 10, 2025
d86958f
fix typo
BartSteurDeltares Nov 10, 2025
1d87856
add product to artifact name
BartSteurDeltares Nov 11, 2025
5d49094
typo
BartSteurDeltares Nov 11, 2025
602e4b8
use inherited product
BartSteurDeltares Nov 11, 2025
6080e7e
seperate repo field
BartSteurDeltares Nov 11, 2025
1163a68
changed destination
BartSteurDeltares Nov 11, 2025
0340d07
add retention
BartSteurDeltares Nov 11, 2025
7bb31a4
linux instead of lnx64
BartSteurDeltares Nov 11, 2025
b1aa488
windows create artifact step
BartSteurDeltares Nov 14, 2025
4243de4
typo
BartSteurDeltares Nov 14, 2025
4cdb351
upload to nexus windows
BartSteurDeltares Nov 14, 2025
01a1f7f
Merge remote-tracking branch 'origin/main' into all/task/DEVOPSDSC-77…
BartSteurDeltares Nov 17, 2025
78fab01
nexus download windows testbench
BartSteurDeltares Nov 17, 2025
3dc0f04
use nexus artifact
BartSteurDeltares Nov 17, 2025
34836ce
use robocopy
BartSteurDeltares Nov 18, 2025
f710430
add download artifacts linux
BartSteurDeltares Nov 18, 2025
05bc4ec
use nexus artifact linux runtime containers
BartSteurDeltares Nov 19, 2025
f049f53
small copy fix
BartSteurDeltares Nov 19, 2025
20afb79
unit test artifacts
BartSteurDeltares Nov 19, 2025
c8f1d65
remove dependency
BartSteurDeltares Nov 20, 2025
2f0f413
Merge remote-tracking branch 'origin/main' into all/task/DEVOPSDSC-77…
BartSteurDeltares Nov 20, 2025
669caf4
add back artifacts tc linux
BartSteurDeltares Nov 20, 2025
0af0ea5
disable extraction
BartSteurDeltares Nov 20, 2025
cf69c23
move back tc artifacts
BartSteurDeltares Nov 20, 2025
12a895a
typo
BartSteurDeltares Nov 20, 2025
3e31e19
Merge remote-tracking branch 'origin/main' into all/task/DEVOPSDSC-77…
BartSteurDeltares Nov 20, 2025
236bc9d
parameterize
BartSteurDeltares Nov 27, 2025
9d9f7bc
param and remove empty
BartSteurDeltares Nov 27, 2025
4182e5c
also for unit test
BartSteurDeltares Nov 27, 2025
0db49d0
windows parameterize
BartSteurDeltares Nov 27, 2025
af1610a
Merge remote-tracking branch 'origin/main' into all/task/DEVOPSDSC-77…
BartSteurDeltares Nov 27, 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
22 changes: 22 additions & 0 deletions ci/teamcity/Delft3D/linux/collect.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,28 @@ object LinuxCollect : BuildType({
path = "/usr/bin/python3"
arguments = "ci/python/ci_tools/dimrset_delivery/scripts/list_all_what_strings.py --srcdir lnx64 --output dimrset_version_lnx64.txt"
}
script {
name = "Prepare artifact to upload"
scriptContent = """
echo "Creating dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz..."
tar -czf dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz lnx64 dimrset_version_lnx64.txt
""".trimIndent()
}
step {
name = "Upload artifact to Nexus"
type = "RawUploadNexusLinux"
executionMode = BuildStep.ExecutionMode.DEFAULT
param("file_path", "dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz")
param("nexus_username", "%nexus_username%")
param("plugin.docker.imagePlatform", "")
param("plugin.docker.imageId", "")
param("teamcity.step.phase", "")
param("nexus_password", "%nexus_password%")
param("nexus_repo", "/delft3d-dev")
param("nexus_url", "https://artifacts.deltares.nl/repository")
param("plugin.docker.run.parameters", "")
param("target_path", "/07_day_retention/dimrset/dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz")
}
}

failureConditions {
Expand Down
32 changes: 32 additions & 0 deletions ci/teamcity/Delft3D/linux/runtimeContainers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,38 @@ object LinuxRuntimeContainers : BuildType({

steps {
mergeTargetBranch {}
step {
name = "Download artifact from Nexus"
type = "RawDownloadNexusLinux"
executionMode = BuildStep.ExecutionMode.DEFAULT
param("artifact_path", "/07_day_retention/dimrset/dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz")
param("nexus_repo", "/delft3d-dev")
param("nexus_username", "%nexus_username%")
param("plugin.docker.imagePlatform", "")
param("plugin.docker.imageId", "")
param("teamcity.step.phase", "")
param("download_to", ".")
param("nexus_password", "%nexus_password%")
param("nexus_url", "https://artifacts.deltares.nl/repository")
param("plugin.docker.run.parameters", "")
}
script {
name = "Extract artifact"
enabled = false
scriptContent = """
echo "Extracting dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz..."

tar -xzf dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz

mkdir dimrset

cp -r lnx64/bin dimrset/bin

cp -r lnx64/lib dimrset/lib

cp -r lnx64/share dimrset/share
""".trimIndent()
}
exec {
name = "Copy example and readme.txt"
path = "ci/teamcity/Delft3D/linux/scripts/copyExampleAndReadMe.sh"
Expand Down
24 changes: 24 additions & 0 deletions ci/teamcity/Delft3D/linux/unitTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,30 @@ object LinuxUnitTest : BuildType({

steps {
mergeTargetBranch {}
step {
name = "Download artifact from Nexus"
type = "RawDownloadNexusLinux"
executionMode = BuildStep.ExecutionMode.DEFAULT
param("artifact_path", "/07_day_retention/dimrset/dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz")
param("nexus_repo", "/delft3d-dev")
param("nexus_username", "%nexus_username%")
param("plugin.docker.imagePlatform", "")
param("plugin.docker.imageId", "")
param("teamcity.step.phase", "")
param("download_to", ".")
param("nexus_password", "%nexus_password%")
param("nexus_url", "https://artifacts.deltares.nl/repository")
param("plugin.docker.run.parameters", "")
}
script {
name = "Extract artifact"
enabled = false
scriptContent = """
echo "Extracting dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz..."

tar -xzf dimrset_linux_%dep.${LinuxBuild.id}.product%_%build.vcs.number%.tar.gz
""".trimIndent()
}
python {
conditions {
matches("product", """^(fm-(suite|testbench))|(all-testbench)$""")
Expand Down
3 changes: 3 additions & 0 deletions ci/teamcity/Delft3D/settings.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ project {
param("s3_dsctestbench_accesskey", DslContext.getParameter("s3_dsctestbench_accesskey"))
password("s3_dsctestbench_secret", "credentialsJSON:7e8a3aa7-76e9-4211-a72e-a3825ad1a160")

param("nexus_username", DslContext.getParameter("nexus_username"))
password("nexus_password", DslContext.getParameter("nexus_password"))

param("product", "dummy_value")

}
Expand Down
31 changes: 31 additions & 0 deletions ci/teamcity/Delft3D/windows/collect.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,37 @@ object WindowsCollect : BuildType({
matches("dep.${WindowsBuild.id}.build_type", "Release")
}
}
powerShell {
name = "Prepare artifact to upload"
scriptMode = script {
content = """
${'$'}ErrorActionPreference = "Stop"

${'$'}zipName = "dimrset_windows_%dep.${WindowsBuild.id}.product%_%build.vcs.number%.zip"

Write-Host "Creating ${'$'}zipName ..."

Compress-Archive -Path "x64", "dimrset_version_x64.txt" -DestinationPath ${'$'}zipName -Force

Write-Host "ZIP created: ${'$'}zipName"
""".trimIndent()
}
}
step {
name = "Upload artifact to Nexus"
type = "RawUploadNexusWindows"
executionMode = BuildStep.ExecutionMode.DEFAULT
param("file_path", "dimrset_windows_%dep.${WindowsBuild.id}.product%_%build.vcs.number%.zip")
param("nexus_username", "%nexus_username%")
param("plugin.docker.imagePlatform", "")
param("plugin.docker.imageId", "")
param("teamcity.step.phase", "")
param("nexus_password", "%nexus_password%")
param("nexus_repo", "/delft3d-dev")
param("nexus_url", "https://artifacts.deltares.nl/repository")
param("plugin.docker.run.parameters", "")
param("target_path", "/07_day_retention/dimrset/dimrset_windows_%dep.${WindowsBuild.id}.product%_%build.vcs.number%.zip")
}
}

failureConditions {
Expand Down
34 changes: 34 additions & 0 deletions ci/teamcity/Delft3D/windows/test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,40 @@ object WindowsTest : BuildType({

steps {
mergeTargetBranch {}
step {
name = "Download artifact from Nexus"
type = "RawDownloadNexusWindows"
executionMode = BuildStep.ExecutionMode.DEFAULT
param("artifact_path", "/07_day_retention/dimrset/dimrset_windows_%dep.${WindowsBuild.id}.product%_%build.vcs.number%.zip")
param("nexus_repo", "/delft3d-dev")
param("nexus_username", "%nexus_username%")
param("plugin.docker.imagePlatform", "")
param("plugin.docker.imageId", "")
param("teamcity.step.phase", "")
param("download_to", ".")
param("nexus_password", "%nexus_password%")
param("nexus_url", "https://artifacts.deltares.nl/repository")
param("plugin.docker.run.parameters", "")
}
powerShell {
name = "Extract artifact"
enabled = false
scriptMode = script {
content = """
${'$'}ErrorActionPreference = "Stop"

${'$'}zipName = "dimrset_windows_%dep.${WindowsBuild.id}.product%_%build.vcs.number%.zip"

${'$'}dest = "test/deltares_testbench/data/engines/teamcity_artifacts/x64"

Write-Host "Extracting ${'$'}zipName ..."

Expand-Archive -Path ${'$'}zipName -DestinationPath "temp_extract"

robocopy "temp_extract/x64" ${'$'}dest /E /XC /XN /XO
""".trimIndent()
}
}
python {
name = "Run TestBench.py"
id = "RUNNER_testbench"
Expand Down