diff options
author | Ravi Eda <raeda@microsoft.com> | 2017-07-11 19:01:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-11 19:01:24 +0300 |
commit | 959d9a852aa03e0f7c25cf79c00d242d4f5d1709 (patch) | |
tree | ca676d688b05cddb42f77608e8eeb66feb5b2e67 /buildpipeline | |
parent | 0ec2a72a21eccba24764239e3ab985c9d2847969 (diff) |
Remove calls to display init-tools.log in groovy scripts (#22044)
* Update attribute-value in security build definition.
* Remove calls to display `init-tools.log`.
Since this log is displayed when `init-tools` command runs into an error, an explicit call to display the log is redundant.
* Remove try-catch, and an extra logging statement.
Diffstat (limited to 'buildpipeline')
-rw-r--r-- | buildpipeline/linux.groovy | 15 | ||||
-rw-r--r-- | buildpipeline/osx.groovy | 17 | ||||
-rw-r--r-- | buildpipeline/windows.groovy | 17 |
3 files changed, 10 insertions, 39 deletions
diff --git a/buildpipeline/linux.groovy b/buildpipeline/linux.groovy index 26414a56be..15f1689585 100644 --- a/buildpipeline/linux.groovy +++ b/buildpipeline/linux.groovy @@ -16,17 +16,8 @@ simpleDockerNode('microsoft/dotnet-buildtools-prereqs:rhel7_prereqs_2') { def logFolder = getLogFolder() stage ('Initialize tools') { - try { - // Init tools - sh './init-tools.sh' - } - catch (err) { - // On errors for build tools initializations, it's useful to echo the contents of the file - // for easy diagnosis. This could also be copied to the log directory - sh 'cat init-tools.log' - // Ensure the build result is still propagated. - throw err - } + // Init tools + sh './init-tools.sh' } stage ('Generate version assets') { // Generate the version assets. Do we need to even do this for non-official builds? @@ -87,4 +78,4 @@ stage ('Execute Tests') { contextBase = "Linux x64 Tests - ${params.CGroup}" } waitForHelixRuns(submittedHelixJson, contextBase) -}
\ No newline at end of file +} diff --git a/buildpipeline/osx.groovy b/buildpipeline/osx.groovy index 72b0275ca7..113899ab83 100644 --- a/buildpipeline/osx.groovy +++ b/buildpipeline/osx.groovy @@ -16,18 +16,9 @@ simpleNode('OSX10.12','latest') { def logFolder = getLogFolder() stage ('Initialize tools') { - try { - // Workaround nuget issue https://github.com/NuGet/Home/issues/5085 were we need to set HOME - // Init tools - sh 'HOME=\$WORKSPACE/tempHome ./init-tools.sh' - } - catch (err) { - // On errors for build tools initializations, it's useful to echo the contents of the file - // for easy diagnosis. This could also be copied to the log directory - sh 'cat init-tools.log' - // Ensure the build result is still propagated. - throw err - } + // Workaround nuget issue https://github.com/NuGet/Home/issues/5085 were we need to set HOME + // Init tools + sh 'HOME=\$WORKSPACE/tempHome ./init-tools.sh' } stage ('Generate version assets') { // Generate the version assets. Do we need to even do this for non-official builds? @@ -46,4 +37,4 @@ simpleNode('OSX10.12','latest') { } sh "HOME=\$WORKSPACE/tempHome ./build-tests.sh -buildArch=x64 -${params.CGroup} ${additionalArgs} -- /p:ArchiveTests=true /p:EnableDumpling=true" } -}
\ No newline at end of file +} diff --git a/buildpipeline/windows.groovy b/buildpipeline/windows.groovy index 0b13998df4..6b042f8c68 100644 --- a/buildpipeline/windows.groovy +++ b/buildpipeline/windows.groovy @@ -28,19 +28,8 @@ simpleNode('Windows_NT','latest') { def buildTests = (params.TGroup != 'all') stage ('Initialize tools') { - try { - // Init tools - bat '.\\init-tools.cmd' - // Temporarily always dump the init-tools.log to try and identify why sometimes it takes really long - bat 'type init-tools.log' - } - catch (err) { - // On errors for build tools initializations, it's useful to echo the contents of the file - // for easy diagnosis. This could also be copied to the log directory - bat 'type init-tools.log' - // Ensure the build result is still propagated. - throw err - } + // Init tools + bat '.\\init-tools.cmd' } stage ('Sync') { bat ".\\sync.cmd -p -- /p:ArchGroup=${params.AGroup} /p:RuntimeOS=win10" @@ -112,4 +101,4 @@ if (submitToHelix) { } waitForHelixRuns(submittedHelixJson, contextBase) } -}
\ No newline at end of file +} |