From c69c188de9a7458f57eafa7ea7976e5d19867cc5 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Fri, 5 May 2017 18:00:33 -0600 Subject: [PATCH] cleaned up jenkinsfile stages --- Jenkinsfile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3cb8a2c6..40e63e49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,7 @@ node('windows') { def testResultFileNormal = "${testResultFilePrefix}_UnitTests_normal.xml" def testResultFilePortable = "${testResultFilePrefix}_UnitTests_portable.xml" def testResultFileAcceptance = "${testResultFilePrefix}_AcceptanceTests.xml" + def coverageReport = "code_coverage_report.xml" def codeCoverageHtml = "CodeCoverageReport.html" stage ('Checkout Branch') { @@ -29,8 +30,8 @@ node('windows') { bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Configuration=\"Debug Portable\";Platform=x86 \"${jobDir}\\mRemoteV1.sln\"" } - stage ('Run Unit Tests (Normal)') { - bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\debug\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86" + stage ('Run Unit Tests (Normal, w/coverage)') { + bat "\"${openCoverPath}\" -register:user -target:\"${nunitConsolePath}\" -targetargs:\"\"${jobDir}\\mRemoteNGTests\\bin\\debug\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86\" -output:\"${coverageReport}\"" } stage ('Run Unit Tests (Portable)') { @@ -40,15 +41,10 @@ node('windows') { stage ('Run Acceptance Tests') { bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNG.Specs\\bin\\debug\\mRemoteNG.Specs.dll\" --result=${testResultFileAcceptance} --x86" } - - stage ('Generate Code Coverage Report') { - def coverageReport = "code_coverage_report.xml" - bat "\"${openCoverPath}\" -register:user -target:\"${nunitConsolePath}\" -targetargs:\"\"${jobDir}\\mRemoteNGTests\\bin\\debug\\mRemoteNGTests.dll\" --x86\" -output:\"${coverageReport}\"" - bat "\"${reportGeneratorPath}\" -reports:\"${jobDir}\\${coverageReport}\" -targetdir:\"${jobDir}\\reports\" -reporttypes:HtmlSummary" - } - stage ('Upload test results') { + stage ('Upload Reports') { nunit testResultsPattern: "${testResultFilePrefix}*.xml" - publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: false, reportDir: 'reports', reportFiles: 'summary.htm', reportName: 'Code Coverage Report', reportTitles: '']) + bat "\"${reportGeneratorPath}\" -reports:\"${jobDir}\\${coverageReport}\" -targetdir:\"${jobDir}\\reports\" -reporttypes:Html" + publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: false, reportDir: 'reports', reportFiles: 'index.htm', reportName: 'Code Coverage Report', reportTitles: '']) } }