Module: check_mk Branch: master Commit: f0f40b865a5b3b48473b1b29e2e75360829014ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0f40b865a5b3b… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Apr 17 15:04:22 2019 +0200 use only one stash insted of many Change-Id: Ic5014d2588a13d575d04c3464dcc8528e6f74cfe --- buildscripts/scripts/nightly-build.jenkins | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 1b1a909..4ec218f 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -91,19 +91,9 @@ node { break } sh "make NEW_VERSION=${CMK_VERS} setversion" - - dir('agents/wnx') { - stash name: 'WinSRC', include: '**/*' - } - dir('agents/windows/dependencies/') { - stash name: 'WinDep', include: '**/*' - } - dir('agents/windows/plugins/') { - stash name: 'WinPlugins', include: '**/*' - } - dir('omd/packages/') { - stash name: 'WinDepOMD', include: 'googletest/*, simpleini/*' - } + + stash name: 'WinDep', include: 'agents/wnx/**/*, agents/windows/dependencies/**/*, agents/windows/plugins/**/*, omd/packages/googletest/*, omd/packages/simpleini/*' + } } } @@ -115,18 +105,7 @@ AGENT_LIST.each { AGENT -> if (AGENT == 'windows') { node('windows') { bat 'powershell Remove-Item .\\* -Recurse -Force' - dir('agents/wnx') { - unstash name: 'WinSRC' - } - dir('agents/windows/dependencies/') { - unstash name: 'WinDep' - } - dir('agents/windows/plugins/') { - unstash name: 'WinPlugins' - } - dir('omd/packages/') { - unstash name: 'WinDepOMD' - } + unstash name: 'WinDep' bat 'cd agents\\wnx && call build_release.cmd' dir('artefacts') { stash name: 'WinMSI', includes: 'check_mk_agent*'