Skip to content
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

Jump to bottom

Delete build files before packaging and increase build timeout #4377

Merged
merged 3 commits into from
Oct 25, 2019
Merged

Delete build files before packaging and increase build timeout #4377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c568b0b
Revert "Move windows build machines to NetCorePublic-Pool. (#4375)"
codemzs Oct 24, 2019
d3742e4
Add step to cleanup test data before building packages to free up space
safern Oct 25, 2019
8b9e2ad
Increase build timeout.
codemzs Oct 25, 2019
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
9 changes: 3 additions & 6 deletions .vsts-dotnet-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ jobs:
name: Windows_x64_NetCoreApp21
buildScript: build.cmd
pool:
name: NetCorePublic-Pool
queue: buildpool.windows.10.amd64.vs2017.open
name: Hosted VS2017

- template: /build/ci/job-template.yml
parameters:
Expand All @@ -82,14 +81,12 @@ jobs:
_config_short: RFX
_includeBenchmarkData: false
pool:
name: NetCorePublic-Pool
queue: buildpool.windows.10.amd64.vs2017.open
name: Hosted VS2017

- template: /build/ci/job-template.yml
parameters:
name: Windows_x86_NetCoreApp21
architecture: x86
buildScript: build.cmd
pool:
name: NetCorePublic-Pool
queue: buildpool.windows.10.amd64.vs2017.open
name: Hosted VS2017
32 changes: 31 additions & 1 deletion build/ci/job-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ parameters:
jobs:
- job: ${{ parameters.name }}
${{ if eq(parameters.codeCoverage, 'false') }}:
timeoutInMinutes: 40
timeoutInMinutes: 60
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should really be careful about letting our builds take so long. This isn't a huge project, and having an hour CI time doesn't seem great. Maybe someone should investigate what is taking so long in our builds.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eric, I will revert this back after the release. We have a huge backlog of PRs that is threatening the release.

In reply to: 339138790 [](ancestors = 339138790)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed - we need to get unblocked in the short term. I meant to say that someone should investigate it after this gets us unblocked.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect the reason our build times went up is because of newly added TensorFlow tests that each take easily a minute to run. We can try to reduce the dataset size but obviously after this release.

CC: @ashbhandare @harshithapv @bpstark

${{ if eq(parameters.codeCoverage, 'true') }}:
timeoutInMinutes: 60
strategy:
Expand Down Expand Up @@ -77,5 +77,35 @@ jobs:
pathToPublish: $(Build.ArtifactStagingDirectory)
artifactName: ${{ parameters.name }} $(_config_short)
artifactType: container
- ${{ if eq(parameters.buildScript, 'build.cmd') }}:
- powershell: |
$taskListOutput = & TaskList /FI "IMAGENAME eq dotnet.exe" | Out-String
if ($taskListOutput.Contains("dotnet.exe"))
{
Write-Output "Killing dotnet.exe processes..."
& taskkill /IM dotnet.exe /F
}

if (Test-Path .\packages\)
{
Write-Output "Removing nuget cache dir..."
Remove-Item -Force -Recurse .\packages\
}

if (Test-Path .\test\data\external\)
{
Write-Output "Removing external test data..."
Remove-Item -Force -Recurse .\test\data\external\
}

mkdir .\tmp\
Move-Item .\bin\obj\packages .\tmp\
Write-Output "Removing bin dir..."
Remove-Item -Force -Recurse .\bin\
mkdir .\bin\obj\
Move-Item .\tmp\packages\ .\bin\obj\
Remove-Item -Force -Recurse .\tmp\
Write-Output "Done cleaning up binary folder..."
displayName: Clean up test data
- script: ${{ parameters.buildScript }} -buildPackages
displayName: Build Packages