From 48662075434da5a13b1316df1ac7488a81e4cf0a Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Thu, 12 Sep 2019 14:53:33 +0200 Subject: [PATCH] Zap a fixed folder, add build number to folder inside Signed-off-by: Stefan Scherer --- Jenkinsfile | 4 ++-- hack/ci/windows.ps1 | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 32c0307d7deaf..ff958445f1220 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -743,7 +743,7 @@ pipeline { SOURCES_DRIVE = 'd' SOURCES_SUBDIR = 'gopath' TESTRUN_DRIVE = 'd' - TESTRUN_SUBDIR = "CI-$BUILD_NUMBER" + TESTRUN_SUBDIR = "CI" WINDOWS_BASE_IMAGE = 'mcr.microsoft.com/windows/servercore' WINDOWS_BASE_IMAGE_TAG = 'ltsc2016' } @@ -804,7 +804,7 @@ pipeline { SOURCES_DRIVE = 'd' SOURCES_SUBDIR = 'gopath' TESTRUN_DRIVE = 'd' - TESTRUN_SUBDIR = "CI-$BUILD_NUMBER" + TESTRUN_SUBDIR = "CI" WINDOWS_BASE_IMAGE = 'mcr.microsoft.com/windows/servercore' WINDOWS_BASE_IMAGE_TAG = 'ltsc2019' } diff --git a/hack/ci/windows.ps1 b/hack/ci/windows.ps1 index aa0a67a3a2c6e..1bf2fe59e230f 100644 --- a/hack/ci/windows.ps1 +++ b/hack/ci/windows.ps1 @@ -51,6 +51,15 @@ Write-Host -ForegroundColor Red "----------------------------------------------- # TESTRUN_DRIVE\TESTRUN_SUBDIR\CI- or # d:\CI\CI- # +# Optional environment variables help in CI: +# +# BUILD_NUMBER + BRANCH_NAME are optional variables to be added to the directory below TESTRUN_SUBDIR +# to have individual folder per CI build. If some files couldn't be +# cleaned up and we want to re-run the build in CI. +# Hence, the daemon under test is run under +# TESTRUN_DRIVE\TESTRUN_SUBDIR\PR-\ or +# d:\CI\PR-\ +# # In addition, the following variables can control the run configuration: # # DOCKER_DUT_DEBUG if defined starts the daemon under test in debug mode. @@ -428,7 +437,12 @@ Try { # Redirect to a temporary location. $TEMPORIG=$env:TEMP - $env:TEMP="$env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR\CI-$COMMITHASH" + if ($null -eq $env:BUILD_NUMBER) { + $env:TEMP="$env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR\CI-$COMMITHASH" + } else { + # individual temporary location per CI build that better matches the BUILD_URL + $env:TEMP="$env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR\$env:BRANCH_NAME\$env:BUILD_NUMBER" + } $env:LOCALAPPDATA="$env:TEMP\localappdata" $errorActionPreference='Stop' New-Item -ItemType Directory "$env:TEMP" -ErrorAction SilentlyContinue | Out-Null