diff options
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/test-job.yml | 39 | ||||
| -rw-r--r-- | eng/xplat-job.yml | 3 |
2 files changed, 25 insertions, 17 deletions
diff --git a/eng/test-job.yml b/eng/test-job.yml index 00982f762b..d596c936db 100644 --- a/eng/test-job.yml +++ b/eng/test-job.yml @@ -30,22 +30,29 @@ jobs: variables: # Map template parameters to command line arguments - ${{ if eq(parameters.priority, '1') }}: - ${{ if or(eq(parameters.osGroup, 'Linux'), eq(parameters.osGroup, 'OSX')) }}: - priorityArg: 'priority1' - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - priorityArg: '-priority=1' - ${{ if eq(parameters.priority, '0') }}: - priorityArg: '' - - ${{ if eq(parameters.crossgen, 'true') }}: - crossgenArg: 'crossgen' - ${{ if eq(parameters.crossgen, 'false') }}: - crossgenArg: '' - ${{ if ne(parameters.scenarios, '') }}: - scenariosArg: ${{ format('/p:Scenarios=\"{0}\"', parameters.scenarios) }} - ${{ if eq(parameters.scenarios, '') }}: - scenariosArg: '' + - ${{ if eq(parameters.priority, '1') }}: + - ${{ if or(eq(parameters.osGroup, 'Linux'), eq(parameters.osGroup, 'OSX')) }}: + - name: priorityArg + value: 'priority1' + - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - name: priorityArg + value: '-priority=1' + - ${{ if eq(parameters.priority, '0') }}: + - name: priorityArg + value: '' + + - ${{ if eq(parameters.crossgen, 'true') }}: + - name: crossgenArg + value: 'crossgen' + - ${{ if eq(parameters.crossgen, 'false') }}: + - name: crossgenArg + value: '' + - ${{ if ne(parameters.scenarios, '') }}: + - name: scenariosArg + value: ${{ format('/p:Scenarios=\"{0}\"', parameters.scenarios) }} + - ${{ if eq(parameters.scenarios, '') }}: + - name: scenariosArg + value: '' # TODO: Enable crossgen in build-test.sh. It currently doesn't # accept a crossgen arg, so disable the macos/linux crossgen test diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml index 9c92ea4cdd..d9d45d1486 100644 --- a/eng/xplat-job.yml +++ b/eng/xplat-job.yml @@ -86,6 +86,7 @@ jobs: - name: rootfsDir value: /crossrootfs/arm64 - - ${{insert}}: ${{ parameters.variables }} + - ${{ each variable in parameters.variables }}: + - ${{insert}}: ${{ variable }} steps: ${{ parameters.steps }} |