@@ -2,9 +2,6 @@ parameters:
2
2
- name : Location
3
3
type : string
4
4
default : ' '
5
- - name : SubscriptionConfiguration
6
- type : string
7
- default : $(sub-config-azure-cloud-test-resources)
8
5
- name : ServiceDirectory
9
6
type : string
10
7
default : not-specified
@@ -109,7 +106,7 @@ jobs:
109
106
dotnet tool install dotnet-reportgenerator-globaltool --tool-path tools
110
107
displayName: Install coverage tools
111
108
# CODE_COVERAGE variable is '' (do-not-generate) in all matrix but linux-gcc
112
- # It is 'enabled' by default on linux-gcc but it can be opt-out by each pipeline (disabled)
109
+ # It is 'enabled' by default on linux-gcc but it can be opt-out by each pipeline (disabled)
113
110
condition: and(succeededOrFailed(), ne(variables['CODE_COVERAGE'], 'disabled'), ne(variables['CODE_COVERAGE'], ''))
114
111
115
112
- template : /eng/pipelines/templates/steps/cmake-build.yml
@@ -119,12 +116,16 @@ jobs:
119
116
BuildArgs : " $(BuildArgs)"
120
117
Env : " $(CmakeEnvArg)"
121
118
119
+ - template : /eng/common/TestResources/build-test-resource-config.yml
120
+ parameters :
121
+ SubscriptionConfiguration : ${{ parameters.CloudConfig.SubscriptionConfiguration }}
122
+ SubscriptionConfigurations : ${{ parameters.CloudConfig.SubscriptionConfigurations }}
123
+
122
124
- template : /eng/common/TestResources/deploy-test-resources.yml
123
125
parameters :
124
126
ServiceDirectory : ${{ parameters.ServiceDirectory }}
125
- ${{ if or(parameters.Location, parameters.CloudConfig.Location) }} :
126
- Location : ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
127
- SubscriptionConfiguration : ${{ parameters.CloudConfig.SubscriptionConfiguration }}
127
+ Location : ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
128
+ SubscriptionConfiguration : $(SubscriptionConfiguration)
128
129
129
130
# For non multi-config generator use the same build configuration to run tests
130
131
# We don't need to set it to invoke ctest
@@ -191,9 +192,9 @@ jobs:
191
192
codeCoverageTool : Cobertura
192
193
summaryFileLocation : ' $(Build.SourcesDirectory)/**/Cobertura.xml'
193
194
displayName : Publish Code Coverage to DevOps
194
- condition : and(succeededOrFailed(), ne(variables['CODE_COVERAGE'], 'disabled'), ne(variables['CODE_COVERAGE'], ''))
195
+ condition : and(succeededOrFailed(), ne(variables['CODE_COVERAGE'], 'disabled'), ne(variables['CODE_COVERAGE'], ''))
195
196
196
197
- template : /eng/common/TestResources/remove-test-resources.yml
197
198
parameters :
198
199
ServiceDirectory : ${{ parameters.ServiceDirectory }}
199
- SubscriptionConfiguration : ${{ parameters. SubscriptionConfiguration }}
200
+ SubscriptionConfiguration : $( SubscriptionConfiguration)
0 commit comments