-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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.
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
Use agent's temp dir if available #6673
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4a6aa93
Use agent's temp dir if available
bishal-pdMSFT 55c4609
check for path length as well
bishal-pdMSFT 0dd4bec
Minor fix. Added L0 tests
bishal-pdMSFT 4209768
Move temp-path helper to common helpers
bishal-pdMSFT 315046d
PR comments
bishal-pdMSFT e1ec2bf
resolve merge conflict
bishal-pdMSFT 47ab998
Merge branch 'master' into users/biprasad/useAgentTemp
bishal-pdMSFT File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -80,8 +80,8 @@ function Get-NamesFromApplicationManifest | |
$appTypeSuffix = 'Type' | ||
|
||
$h = @{ | ||
FabricNamespace = $FabricNamespace; | ||
ApplicationTypeName = $appMan.ApplicationTypeName; | ||
FabricNamespace = $FabricNamespace; | ||
ApplicationTypeName = $appMan.ApplicationTypeName; | ||
ApplicationTypeVersion = $appMan.ApplicationTypeVersion; | ||
} | ||
|
||
|
@@ -163,9 +163,10 @@ function Get-ApplicationParametersFromApplicationParameterFile | |
|
||
$hash = @{} | ||
$ParametersXml.ChildNodes | foreach { | ||
if ($_.LocalName -eq 'Parameter') { | ||
$hash[$_.Name] = $_.Value | ||
} | ||
if ($_.LocalName -eq 'Parameter') | ||
{ | ||
$hash[$_.Name] = $_.Value | ||
} | ||
} | ||
|
||
return $hash | ||
|
@@ -206,21 +207,25 @@ function Merge-HashTables | |
return $HashTableNew | ||
} | ||
|
||
function Get-TempDirectoryPath { | ||
function Get-TempDirectoryPath | ||
{ | ||
<# | ||
.SYNOPSIS | ||
Returns a temp directory path. Uses Agent.TempDirectory if available | ||
Returns a temp directory path. Uses Agent.TempDirectory if available if shorter than env temp | ||
#> | ||
|
||
Param () | ||
|
||
$agentVersion = Get-VstsTaskVariable -Name 'agent.version' | ||
if (!$agentVersion -or (([version]'2.115.0').CompareTo([version]$agentVersion) -ge 1)) | ||
{ | ||
return $env:Temp | ||
} | ||
else | ||
$envTemp = $env:Temp | ||
if ($agentVersion -and (([version]'2.115.0').CompareTo([version]$agentVersion) -lt 1)) | ||
{ | ||
return Get-VstsTaskVariable -Name 'Agent.TempDirectory' | ||
$agentTemp = Get-VstsTaskVariable -Name 'Agent.TempDirectory' | ||
if ($agentTemp.Length -le $envTemp) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. $envTemp.Length? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. fixed and added L0 tests as well |
||
{ | ||
return $agentTemp | ||
} | ||
} | ||
|
||
return $envTemp | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider:
The Service Fabric Update Manifests task also uses a temp directory (although it uses $ENV:AGENT_TEMPDIRECTORY) Probably would be prudent to put this in the Service Fabric common scripts and use it in both places.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#fixed