Skip to content

Commit

Permalink
Update the list of 3rd party dlls to sign (#3089)
Browse files Browse the repository at this point in the history 
This fixes the release build following the latest
update of vss-api-netcore in #3061.

Also updates the release pipeline to support a
"buildStageOnly" flag that makes it easier
to test such changes in the future without having
to temporarily comment out parts of the build.

Co-authored-by: maroghel <[email protected]>
  • Loading branch information
@mjroghelia
mjroghelia and maroghel authored Aug 20, 2020
1 parent c14c1c9 commit 8a663a0
Show file tree
Hide file tree
Showing 3 changed files with 140 additions and 128 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/build-job.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
condition: always()

# Code coverage
- ${{ if parameters.codeCoverage }}:
- ${{ if and(parameters.codeCoverage, parameters.unitTests, parameters.functionalTests) }}:
- script: dotnet tool install --global dotnet-reportgenerator-globaltool
displayName: Install Report Generator

Expand Down
4 changes: 4 additions & 0 deletions .azure-pipelines/signing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,14 @@ steps:
bin\NCrontab.Signed.dll
bin\Newtonsoft.Json.dll
bin\Newtonsoft.Json.Bson.dll
bin\RocksDbNative.dll
bin\RocksDbSharp.dll
bin\RuntimeContracts.dll
bin\System.Interactive.Async.dll
bin\System.IO.Abstractions.dll
bin\System.Linq.Async.dll
bin\YamlDotNet.dll
bin\native\amd64\rocksdb.dll
externals\git\**\*.dll
externals\git\**\*.exe
externals\node\bin\node.exe
Expand Down
262 changes: 135 additions & 127 deletions .vsts.release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ parameters:
type: boolean
default: false
displayName: Skip Tests
# buildStageOnly is useful for testing changes of the build stage which cannot be tested
# in the ci project, like signing, without actually doing a release
- name: buildStageOnly
type: boolean
default: false
displayName: Build Stage Only

variables:
releaseBranch: releases/${{ parameters.version }}
Expand All @@ -23,145 +29,147 @@ extends:
sign: true
publishArtifacts: true

preBuildStages:
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
- stage: Create_Release_Branch
displayName: Create Release Branch
${{ if not(parameters.buildStageOnly) }}:
preBuildStages:
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
- stage: Create_Release_Branch
displayName: Create Release Branch
jobs:
################################################################################
- job: Create_Release_Branch
################################################################################
displayName: Create Release Branch
pool:
vmImage: ubuntu-18.04

steps:
- checkout: self

- script: |
cd release
npm install
node createReleaseBranch.js ${{ parameters.version }} --derivedFrom=${{ parameters.derivedFrom }}
env:
EDITOR: cat
PAT: $(GithubToken)
displayName: Push release branch to GitHub
${{ if not(parameters.buildStageOnly) }}:
postBuildStages:
- stage: Release
jobs:
################################################################################
- job: Create_Release_Branch
- job: publish_agent_packages
################################################################################
displayName: Create Release Branch
displayName: Publish Agents (Windows/Linux/OSX)
pool:
vmImage: ubuntu-18.04

name: ProductionRMAgents
steps:
- checkout: self

- script: |
cd release
npm install
node createReleaseBranch.js ${{ parameters.version }} --derivedFrom=${{ parameters.derivedFrom }}
env:
EDITOR: cat
PAT: $(GithubToken)
displayName: Push release branch to GitHub
postBuildStages:
- stage: Release
jobs:
################################################################################
- job: publish_agent_packages
################################################################################
displayName: Publish Agents (Windows/Linux/OSX)
pool:
name: ProductionRMAgents
steps:

# Clean
- checkout: self
clean: true
# Clean
- checkout: self
clean: true

# Switch to release branch
- template: switch-branch.yml
parameters:
branch: ${{ variables.releaseBranch }}

# Download all agent packages from all previous phases
- task: DownloadBuildArtifacts@0
displayName: Download Agent Packages
inputs:
artifactName: agent
# Switch to release branch
- template: switch-branch.yml
parameters:
branch: ${{ variables.releaseBranch }}
# Download all agent packages from all previous phases
- task: DownloadBuildArtifacts@0
displayName: Download Agent Packages
inputs:
artifactName: agent

# Upload agent packages to Azure blob storage and refresh Azure CDN
- powershell: |
Write-Host "Preloading Azure modules." # This is for better performance, to avoid module-autoloading.
Import-Module AzureRM, AzureRM.profile, AzureRM.Storage, Azure.Storage, AzureRM.Cdn -ErrorAction Ignore -PassThru
Enable-AzureRmAlias -Scope CurrentUser
$uploadFiles = New-Object System.Collections.ArrayList
$certificateThumbprint = (Get-ItemProperty -Path "$(ServicePrincipalReg)").ServicePrincipalCertThumbprint
$clientId = (Get-ItemProperty -Path "$(ServicePrincipalReg)").ServicePrincipalClientId
Write-Host "##vso[task.setsecret]$certificateThumbprint"
Write-Host "##vso[task.setsecret]$clientId"
Login-AzureRmAccount -ServicePrincipal -CertificateThumbprint $certificateThumbprint -ApplicationId $clientId -TenantId $(TenantId)
Select-AzureRmSubscription -SubscriptionId $(SubscriptionId)
$storage = Get-AzureRmStorageAccount -ResourceGroupName vstsagentpackage -AccountName vstsagentpackage
Get-ChildItem -LiteralPath "$(System.ArtifactsDirectory)/agent" | ForEach-Object {
$executable = (Get-ChildItem "$(System.ArtifactsDirectory)/agent/$_")[0]
$versionDir = $executable.Name.Trim('.zip').Trim('.tar.gz')
$versionDir = $versionDir.SubString($versionDir.LastIndexOf('-') + 1)
Write-Host "##vso[task.setvariable variable=ReleaseAgentVersion;]$versionDir"
Write-Host "Uploading $executable to BlobStorage vstsagentpackage/agent/$versionDir"
Set-AzureStorageBlobContent -Context $storage.Context -Container agent -File "$(System.ArtifactsDirectory)/agent/$_/$executable" -Blob "$versionDir/$executable" -Force
$uploadFiles.Add("/agent/$versionDir/$executable")
}
Write-Host "Purge Azure CDN Cache"
Unpublish-AzureRmCdnEndpointContent -EndpointName vstsagentpackage -ProfileName vstsagentpackage -ResourceGroupName vstsagentpackage -PurgeContent $uploadFiles
Write-Host "Force Refresh Azure CDN Cache"
Publish-AzureRmCdnEndpointContent -EndpointName vstsagentpackage -ProfileName vstsagentpackage -ResourceGroupName vstsagentpackage -LoadContent $uploadFiles
displayName: Upload to Azure Blob
# Upload agent packages to Azure blob storage and refresh Azure CDN
- powershell: |
Write-Host "Preloading Azure modules." # This is for better performance, to avoid module-autoloading.
Import-Module AzureRM, AzureRM.profile, AzureRM.Storage, Azure.Storage, AzureRM.Cdn -ErrorAction Ignore -PassThru
Enable-AzureRmAlias -Scope CurrentUser
$uploadFiles = New-Object System.Collections.ArrayList
$certificateThumbprint = (Get-ItemProperty -Path "$(ServicePrincipalReg)").ServicePrincipalCertThumbprint
$clientId = (Get-ItemProperty -Path "$(ServicePrincipalReg)").ServicePrincipalClientId
Write-Host "##vso[task.setsecret]$certificateThumbprint"
Write-Host "##vso[task.setsecret]$clientId"
Login-AzureRmAccount -ServicePrincipal -CertificateThumbprint $certificateThumbprint -ApplicationId $clientId -TenantId $(TenantId)
Select-AzureRmSubscription -SubscriptionId $(SubscriptionId)
$storage = Get-AzureRmStorageAccount -ResourceGroupName vstsagentpackage -AccountName vstsagentpackage
Get-ChildItem -LiteralPath "$(System.ArtifactsDirectory)/agent" | ForEach-Object {
$executable = (Get-ChildItem "$(System.ArtifactsDirectory)/agent/$_")[0]
$versionDir = $executable.Name.Trim('.zip').Trim('.tar.gz')
$versionDir = $versionDir.SubString($versionDir.LastIndexOf('-') + 1)
Write-Host "##vso[task.setvariable variable=ReleaseAgentVersion;]$versionDir"
Write-Host "Uploading $executable to BlobStorage vstsagentpackage/agent/$versionDir"
Set-AzureStorageBlobContent -Context $storage.Context -Container agent -File "$(System.ArtifactsDirectory)/agent/$_/$executable" -Blob "$versionDir/$executable" -Force
$uploadFiles.Add("/agent/$versionDir/$executable")
}
Write-Host "Purge Azure CDN Cache"
Unpublish-AzureRmCdnEndpointContent -EndpointName vstsagentpackage -ProfileName vstsagentpackage -ResourceGroupName vstsagentpackage -PurgeContent $uploadFiles
Write-Host "Force Refresh Azure CDN Cache"
Publish-AzureRmCdnEndpointContent -EndpointName vstsagentpackage -ProfileName vstsagentpackage -ResourceGroupName vstsagentpackage -LoadContent $uploadFiles
displayName: Upload to Azure Blob
# Create agent release on Github
- powershell: |
Write-Host "Creating github release."
$releaseNotes = [System.IO.File]::ReadAllText("$(Build.SourcesDirectory)\releaseNote.md").Replace("<AGENT_VERSION>","$(ReleaseAgentVersion)")
$releaseData = @{
tag_name = "v$(ReleaseAgentVersion)";
target_commitish = "$(Build.SourceVersion)";
name = "v$(ReleaseAgentVersion)";
body = $releaseNotes;
draft = $false;
prerelease = $true;
}
$releaseParams = @{
Uri = "https://api.github.com/repos/Microsoft/azure-pipelines-agent/releases";
Method = 'POST';
Headers = @{
Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("vsts:$(GithubToken)"));
# Create agent release on Github
- powershell: |
Write-Host "Creating github release."
$releaseNotes = [System.IO.File]::ReadAllText("$(Build.SourcesDirectory)\releaseNote.md").Replace("<AGENT_VERSION>","$(ReleaseAgentVersion)")
$releaseData = @{
tag_name = "v$(ReleaseAgentVersion)";
target_commitish = "$(Build.SourceVersion)";
name = "v$(ReleaseAgentVersion)";
body = $releaseNotes;
draft = $false;
prerelease = $true;
}
ContentType = 'application/json';
Body = (ConvertTo-Json $releaseData -Compress)
}
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
$releaseCreated = Invoke-RestMethod @releaseParams
Write-Host $releaseCreated
$releaseId = $releaseCreated.id
$assets = [System.IO.File]::ReadAllText("$(Build.SourcesDirectory)\assets.json").Replace("<AGENT_VERSION>","$(ReleaseAgentVersion)")
$assetsParams = @{
Uri = "https://uploads.github.com/repos/Microsoft/azure-pipelines-agent/releases/$releaseId/assets?name=assets.json"
Method = 'POST';
Headers = @{
Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("vsts:$(GithubToken)"));
$releaseParams = @{
Uri = "https://api.github.com/repos/Microsoft/azure-pipelines-agent/releases";
Method = 'POST';
Headers = @{
Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("vsts:$(GithubToken)"));
}
ContentType = 'application/json';
Body = (ConvertTo-Json $releaseData -Compress)
}
ContentType = 'application/octet-stream';
Body = [system.Text.Encoding]::UTF8.GetBytes($assets)
}
Invoke-RestMethod @assetsParams
displayName: Create agent release on Github
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
$releaseCreated = Invoke-RestMethod @releaseParams
Write-Host $releaseCreated
$releaseId = $releaseCreated.id
$assets = [System.IO.File]::ReadAllText("$(Build.SourcesDirectory)\assets.json").Replace("<AGENT_VERSION>","$(ReleaseAgentVersion)")
$assetsParams = @{
Uri = "https://uploads.github.com/repos/Microsoft/azure-pipelines-agent/releases/$releaseId/assets?name=assets.json"
Method = 'POST';
Headers = @{
Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("vsts:$(GithubToken)"));
}
ContentType = 'application/octet-stream';
Body = [system.Text.Encoding]::UTF8.GetBytes($assets)
}
Invoke-RestMethod @assetsParams
displayName: Create agent release on Github
- stage: CreatePR
jobs:
################################################################################
- job: create_ado_pr
################################################################################
displayName: Create PR in AzureDevOps
pool:
vmImage: ubuntu-18.04
- stage: CreatePR
jobs:
################################################################################
- job: create_ado_pr
################################################################################
displayName: Create PR in AzureDevOps
pool:
vmImage: ubuntu-18.04

steps:
- checkout: self
steps:
- checkout: self

- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
- script: git checkout ${{ variables.releaseBranch }}
displayName: Checkout release branch
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
- script: git checkout ${{ variables.releaseBranch }}
displayName: Checkout release branch

- bash: |
set -x
cd release
npm install
ls
node createAdoPr.js ${{ parameters.version }}
displayName: Create PR in AzureDevOps
env:
USER: $(User)
PAT: $(AdoPAT)
- bash: |
set -x
cd release
npm install
ls
node createAdoPr.js ${{ parameters.version }}
displayName: Create PR in AzureDevOps
env:
USER: $(User)
PAT: $(AdoPAT)

0 comments on commit 8a663a0

Please sign in to comment.