Skip to content

Commit a43abd1

Browse files
committed
conditional insertion test
1 parent a78f205 commit a43abd1

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

.pipelines/build/images.jobs.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ jobs:
77
- ${{ each job_data in parameters.images }}:
88
- job: pkg_${{ job_data.job }}
99
displayName: "Prepare Image Package - ${{ job_data.displayName }} -"
10-
${{ if job_data.condition }}:
11-
condition: ${{ job_data.condition }}
1210
${{ if job_data.strategy }}:
1311
strategy: ${{ job_data.strategy }}
1412
${{ if job_data.dependsOn }}:

.pipelines/run-pipeline.yaml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,25 @@ stages:
1717
repositoryArtifact: drop_setup_env_source
1818
buildScript: .pipelines/build/scripts/$(name).sh
1919
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
20-
condition: contains( variables['acn-ref'] , variables['version'])
2120
strategy:
2221
maxParallel: 5
2322
matrix:
24-
azure_ip_masq_merger:
25-
name: azure-ip-masq-merger
26-
extraArgs: ''
27-
archiveName: azure-ip-masq-merger
28-
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
29-
imageTag: $(Build.BuildNumber)
30-
version: 'v1.7'
31-
npm:
32-
name: npm
33-
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
34-
archiveName: azure-npm
35-
archiveVersion: $(NPM_VERSION)
36-
imageTag: $(Build.BuildNumber)
37-
version: 'v1.6'
23+
${{ if contains(variables['acn-ref'], 'v1.7') }}:
24+
azure_ip_masq_merger:
25+
name: azure-ip-masq-merger
26+
extraArgs: ''
27+
archiveName: azure-ip-masq-merger
28+
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
29+
imageTag: $(Build.BuildNumber)
30+
version: 'v1.7'
31+
${{ if contains(variables['acn-ref'], 'v1.6') }}:
32+
npm:
33+
name: npm
34+
extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
35+
archiveName: azure-npm
36+
archiveVersion: $(NPM_VERSION)
37+
imageTag: $(Build.BuildNumber)
38+
version: 'v1.6'
3839

3940
- job: copy
4041
displayName: Copy Pipeline Files

0 commit comments

Comments
 (0)