Merge in 'release/8.0.1xx' changes
This commit is contained in:
commit
57c85a75bb
3 changed files with 74 additions and 23 deletions
|
@ -19,10 +19,13 @@ parameters:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: Synchronize_VMR
|
- job: Synchronize_VMR
|
||||||
displayName: Synchronize dotnet/dotnet
|
displayName: Synchronize VMR's ${{ parameters.vmrBranch }}
|
||||||
timeoutInMinutes: 120
|
timeoutInMinutes: 120
|
||||||
variables:
|
variables:
|
||||||
|
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
- template: /eng/common/templates/variables/pool-providers.yml
|
- template: /eng/common/templates/variables/pool-providers.yml
|
||||||
|
- ${{ else }}:
|
||||||
|
- template: /eng/common/templates-official/variables/pool-providers.yml
|
||||||
- name: vmrPath
|
- name: vmrPath
|
||||||
value: $(Agent.BuildDirectory)/vmr
|
value: $(Agent.BuildDirectory)/vmr
|
||||||
- ${{ if not(parameters.noPush) }}:
|
- ${{ if not(parameters.noPush) }}:
|
||||||
|
@ -40,16 +43,17 @@ jobs:
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: $(DncEngPublicBuildPool)
|
name: $(DncEngPublicBuildPool)
|
||||||
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
|
image: 1es-ubuntu-2004-open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
os: linux
|
||||||
|
${{ else }}:
|
||||||
name: $(DncEngInternalBuildPool)
|
name: $(DncEngInternalBuildPool)
|
||||||
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
|
demands: ImageOverride -equals 1es-ubuntu-2004
|
||||||
|
os: linux
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- template: ../steps/vmr-prepare.yml
|
- template: ../steps/vmr-prepare.yml
|
||||||
parameters:
|
parameters:
|
||||||
vmrBranch: ${{ parameters.vmrBranch }}
|
vmrBranch: ${{ parameters.vmrBranch }}
|
||||||
isBuiltFromVmr: false
|
|
||||||
|
|
||||||
- template: ../steps/vmr-pull-updates.yml
|
- template: ../steps/vmr-pull-updates.yml
|
||||||
parameters:
|
parameters:
|
||||||
|
@ -57,7 +61,6 @@ jobs:
|
||||||
vmrBranch: ${{ parameters.vmrBranch }}
|
vmrBranch: ${{ parameters.vmrBranch }}
|
||||||
targetRef: ${{ parameters.targetRef }}
|
targetRef: ${{ parameters.targetRef }}
|
||||||
|
|
||||||
|
|
||||||
- ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}:
|
- ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}:
|
||||||
# Push main and release branches to the public VMR
|
# Push main and release branches to the public VMR
|
||||||
- ${{ if or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')) }}:
|
- ${{ if or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')) }}:
|
||||||
|
|
|
@ -17,6 +17,11 @@ resources:
|
||||||
name: dotnet-dotnet
|
name: dotnet-dotnet
|
||||||
ref: $(Build.SourceBranch)
|
ref: $(Build.SourceBranch)
|
||||||
|
|
||||||
|
- repository: 1ESPipelineTemplates
|
||||||
|
type: git
|
||||||
|
name: 1ESPipelineTemplates/1ESPipelineTemplates
|
||||||
|
ref: refs/tags/release
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
- name: vmrBranch
|
- name: vmrBranch
|
||||||
displayName: dotnet-dotnet branch to push to
|
displayName: dotnet-dotnet branch to push to
|
||||||
|
@ -31,7 +36,27 @@ variables:
|
||||||
- name: VmrBranch
|
- name: VmrBranch
|
||||||
value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }}
|
value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }}
|
||||||
|
|
||||||
jobs:
|
extends:
|
||||||
- template: templates/jobs/vmr-synchronization.yml
|
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
|
||||||
|
parameters:
|
||||||
|
sdl:
|
||||||
|
sourceAnalysisPool:
|
||||||
|
name: $(DncEngInternalBuildPool)
|
||||||
|
image: 1es-windows-2022
|
||||||
|
os: windows
|
||||||
|
|
||||||
|
sourceRepositoriesToScan:
|
||||||
|
exclude:
|
||||||
|
- repository: vmr
|
||||||
|
|
||||||
|
componentgovernance:
|
||||||
|
sourceScanPath: $(Agent.BuildDirectory)/vmr
|
||||||
|
ignoreDirectories: $(Agent.BuildDirectory)/vmr/src
|
||||||
|
|
||||||
|
stages:
|
||||||
|
- stage: VMRSynchronization
|
||||||
|
displayName: VMR Synchronization
|
||||||
|
jobs:
|
||||||
|
- template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self
|
||||||
parameters:
|
parameters:
|
||||||
vmrBranch: ${{ variables.VmrBranch }}
|
vmrBranch: ${{ variables.VmrBranch }}
|
|
@ -19,6 +19,11 @@ resources:
|
||||||
endpoint: dotnet
|
endpoint: dotnet
|
||||||
ref: $(Build.SourceBranch)
|
ref: $(Build.SourceBranch)
|
||||||
|
|
||||||
|
- repository: 1ESPipelineTemplates
|
||||||
|
type: git
|
||||||
|
name: 1ESPipelineTemplates/1ESPipelineTemplates
|
||||||
|
ref: refs/tags/release
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
- name: vmrBranch
|
- name: vmrBranch
|
||||||
displayName: dotnet/dotnet branch to push to
|
displayName: dotnet/dotnet branch to push to
|
||||||
|
@ -33,9 +38,27 @@ variables:
|
||||||
- name: VmrBranch
|
- name: VmrBranch
|
||||||
value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }}
|
value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }}
|
||||||
|
|
||||||
jobs:
|
extends:
|
||||||
- template: /eng/pipelines/templates/jobs/vmr-synchronization.yml
|
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
|
||||||
|
parameters:
|
||||||
|
sdl:
|
||||||
|
sourceAnalysisPool:
|
||||||
|
name: $(DncEngInternalBuildPool)
|
||||||
|
image: 1es-windows-2022
|
||||||
|
os: windows
|
||||||
|
|
||||||
|
sourceRepositoriesToScan:
|
||||||
|
exclude:
|
||||||
|
- repository: vmr
|
||||||
|
|
||||||
|
componentgovernance:
|
||||||
|
sourceScanPath: $(Agent.BuildDirectory)/vmr
|
||||||
|
ignoreDirectories: $(Agent.BuildDirectory)/vmr/src
|
||||||
|
|
||||||
|
stages:
|
||||||
|
- stage: VMRSynchronization
|
||||||
|
displayName: VMR Synchronization
|
||||||
|
jobs:
|
||||||
|
- template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self
|
||||||
parameters:
|
parameters:
|
||||||
vmrBranch: ${{ variables.VmrBranch }}
|
vmrBranch: ${{ variables.VmrBranch }}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue