Skip to content
Merged
Changes from 1 commit
Commits
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: 5 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ variables:
isDevelop: $[eq(variables['Build.SourceBranch'], 'refs/heads/develop')]
isEpic: $[or(contains(variables['Build.SourceBranch'], 'epic/'), contains(variables['System.PullRequest.SourceBranch'], 'epic/'))]
isPullRequest: $[eq(variables['Build.Reason'], 'PullRequest')]
isNewES: $[or(contains(variables['Build.SourceBranch'], 'newes/'), contains(variables['System.PullRequest.SourceBranch'], 'newes/'))]
dependencyCheckCacheKey: $[format('dependency-check-v1-{0:yyyyMM}', pipeline.startTime)]
dependencyCheckDataDir: '$(Pipeline.Workspace)/dependency-check-data/v1'

Expand Down Expand Up @@ -49,7 +50,7 @@ stages:
- stage: ES_S3_UP
displayName: 'Upload missing ROR ES dependencies'
dependsOn: [ ]
condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'))
condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'), eq(variables.isNewES, true))
jobs:
- job:
steps:
Expand All @@ -66,7 +67,7 @@ stages:
- stage: OPTIONAL_CHECKS
displayName: 'Optional checks'
dependsOn: [ ES_S3_UP ]
condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'))
condition: and(in(dependencies.ES_S3_UP.result, 'Succeeded', 'Skipped'), ne(variables['Build.Reason'], 'Manual'))
jobs:
- job: CVE_CHECK
steps:
Expand Down Expand Up @@ -115,7 +116,7 @@ stages:
- stage: REQUIRED_CHECKS
displayName: 'Required checks'
dependsOn: [ ES_S3_UP ]
condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'))
condition: and(in(dependencies.ES_S3_UP.result, 'Succeeded', 'Skipped'), ne(variables['Build.Reason'], 'Manual'))
jobs:
- job:
steps:
Expand All @@ -141,7 +142,7 @@ stages:
dependsOn: [ ES_S3_UP ]
condition:
and(
succeeded(),
in(dependencies.ES_S3_UP.result, 'Succeeded', 'Skipped'),
or(
ne(variables['Build.Reason'], 'Manual'),
and(eq(variables['Build.Reason'], 'Manual'), startsWith('${{ parameters.actionToPerform }}', 'run_all_tests'))
Expand Down