summaryrefslogtreecommitdiff
path: root/eng/common/templates
diff options
context:
space:
mode:
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>2019-06-20 18:47:15 -0700
committerJan Kotas <jkotas@microsoft.com>2019-06-20 18:47:15 -0700
commit61dfc51ae30a9a2dbdb637fa200af85ea0435dc5 (patch)
tree409790f6ee25838a1deeb16168d53fd277a154b0 /eng/common/templates
parentbb268ff9b4de85439b464eca7a8140485ebf47b6 (diff)
downloadcoreclr-61dfc51ae30a9a2dbdb637fa200af85ea0435dc5.tar.gz
coreclr-61dfc51ae30a9a2dbdb637fa200af85ea0435dc5.tar.bz2
coreclr-61dfc51ae30a9a2dbdb637fa200af85ea0435dc5.zip
[master] Update dependencies from dotnet/arcade (#25253)
* Update dependencies from https://github.com/dotnet/arcade build 20190619.25 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19319.25 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19319.25 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19319.25 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19319.25
Diffstat (limited to 'eng/common/templates')
-rw-r--r--eng/common/templates/job/execute-sdl.yml37
-rw-r--r--eng/common/templates/job/publish-build-assets.yml1
-rw-r--r--eng/common/templates/post-build/channels/public-dev-release.yml3
-rw-r--r--eng/common/templates/post-build/channels/public-validation-release.yml3
-rw-r--r--eng/common/templates/post-build/setup-maestro-vars.yml28
5 files changed, 59 insertions, 13 deletions
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
new file mode 100644
index 0000000000..2f669fd95b
--- /dev/null
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -0,0 +1,37 @@
+parameters:
+ overrideParameters: '' # Optional: to override values for parameters.
+ additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
+ continueOnError: false # optional: determines whether to continue the build if the step errors;
+ dependsOn: '' # Optional: dependencies of the job
+
+jobs:
+- job: Run_SDL
+ dependsOn: ${{ parameters.dependsOn }}
+ displayName: Run SDL tool
+ variables:
+ - group: DotNet-VSTS-Bot
+ steps:
+ - checkout: self
+ clean: true
+ - task: NuGetToolInstaller@1
+ displayName: 'Install NuGet.exe'
+ - task: NuGetCommand@2
+ displayName: 'Install Guardian'
+ inputs:
+ restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+ feedsToUse: config
+ nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
+ externalFeedCredentials: GuardianConnect
+ restoreDirectory: $(Build.SourcesDirectory)\.packages
+ - ${{ if ne(parameters.overrideParameters, '') }}:
+ - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }}
+ displayName: Execute SDL
+ continueOnError: ${{ parameters.continueOnError }}
+ - ${{ if eq(parameters.overrideParameters, '') }}:
+ - powershell: eng/common/sdl/execute-all-sdl-tools.ps1
+ -GuardianPackageName Microsoft.Guardian.Cli.0.3.2
+ -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
+ -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
+ ${{ parameters.additionalParameters }}
+ displayName: Execute SDL
+ continueOnError: ${{ parameters.continueOnError }}
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index 619ec68aa4..0144221681 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -57,7 +57,6 @@ jobs:
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:Configuration=$(_BuildConfig)
- /v:detailed
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
- task: powershell@2
diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml
index b332cb5173..c61eaa927d 100644
--- a/eng/common/templates/post-build/channels/public-dev-release.yml
+++ b/eng/common/templates/post-build/channels/public-dev-release.yml
@@ -138,8 +138,7 @@ stages:
inputs:
targetType: inline
script: |
- darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken)
- continueOnError: true
+ darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location
- template: ../promote-build.yml
parameters:
diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml
index 0b9719da82..23725c6d62 100644
--- a/eng/common/templates/post-build/channels/public-validation-release.yml
+++ b/eng/common/templates/post-build/channels/public-validation-release.yml
@@ -84,8 +84,7 @@ stages:
inputs:
targetType: inline
script: |
- darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken)
- continueOnError: true
+ darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) --latest-location
- template: ../promote-build.yml
parameters:
diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
index b40e0260a3..9de585a94a 100644
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -16,11 +16,23 @@ jobs:
inputs:
targetType: inline
script: |
- . "$(Build.SourcesDirectory)/eng/common/tools.ps1"
-
- $BarId = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/BARBuildId.txt"
- Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
-
- $Channels = ""
- Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/Channels.txt" | ForEach-Object { $Channels += "$_ ," }
- Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels"
+ # This is needed to make Write-PipelineSetVariable works in this context
+ if ($env:BUILD_BUILDNUMBER -ne "" -and $env:BUILD_BUILDNUMBER -ne $null) {
+ $ci = $true
+
+ . "$(Build.SourcesDirectory)/eng/common/tools.ps1"
+
+ $BarId = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/BARBuildId.txt"
+ Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
+
+ Write-Host "Asked Write-PipelineSetVariable to create BARBuildId with value '$BarId'"
+
+ $Channels = ""
+ Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/Channels.txt" | ForEach-Object { $Channels += "$_ ," }
+ Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels"
+
+ Write-Host "Asked Write-PipelineSetVariable to create InitialChannels with value '$Channels'"
+ }
+ else {
+ Write-Host "This step can only be run in an Azure DevOps CI environment."
+ }