Skip to content

Commit d038ec5

Browse files
paulmedynskipaulmedynski
committed
Pipeline: run unit tests in both Project and Package modes
- run-all-tests-step.yml: Remove the referenceType=='Project' gate on unit tests. Pass ReferenceType and package versions via a runtime variable when in Package mode. - test-abstractions-package-ci-job.yml: Add referenceType parameter (default Project). In Package mode download Abstractions/Logging artifacts and pass ReferenceType + package versions in buildArguments. - test-azure-package-ci-job.yml: Make buildArguments conditional on referenceType; pass ReferenceType + package versions in Package mode. Note: The CI pipeline does not sign assemblies, so TestSigningKeyPath is not needed here. The unsigned IVT in the CI-built packages grants friend access to unsigned test assemblies by name alone.
1 parent 8adea03 commit d038ec5

1 file changed

Lines changed: 86 additions & 70 deletions

File tree

‎eng/pipelines/common/templates/steps/run-all-tests-step.yml‎

Lines changed: 86 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -79,51 +79,62 @@ steps:
7979
condition: succeededOrFailed()
8080

8181
- ${{if eq(parameters.operatingSystem, 'Windows')}}:
82-
- ${{if eq(parameters.referenceType, 'Project')}}:
83-
- task: DotNetCoreCLI@2
84-
displayName: 'Run Unit Tests ${{parameters.msbuildArchitecture }}'
85-
condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
86-
inputs:
87-
command: build
88-
projects: build.proj
89-
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
90-
arguments: >-
91-
-t:TestSqlClientUnit
92-
-p:TestFramework=${{ parameters.targetFramework }}
93-
-p:Configuration=${{ parameters.buildConfiguration }}
94-
-p:TestResultsFolderPath=TestResults
95-
${{ else }}: # x86
96-
arguments: >-
97-
-t:TestSqlClientUnit
98-
-p:TestFramework=${{ parameters.targetFramework }}
99-
-p:Configuration=${{ parameters.buildConfiguration }}
100-
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
101-
-p:TestResultsFolderPath=TestResults
82+
- task: DotNetCoreCLI@2
83+
displayName: 'Run Unit Tests ${{parameters.msbuildArchitecture }}'
84+
condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
85+
inputs:
86+
command: build
87+
projects: build.proj
88+
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
89+
arguments: >-
90+
-t:TestSqlClientUnit
91+
-p:TestFramework=${{ parameters.targetFramework }}
92+
-p:ReferenceType=${{ parameters.referenceType }}
93+
-p:Configuration=${{ parameters.buildConfiguration }}
94+
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
95+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
96+
-p:TestResultsFolderPath=TestResults
97+
${{ else }}: # x86
98+
arguments: >-
99+
-t:TestSqlClientUnit
100+
-p:TestFramework=${{ parameters.targetFramework }}
101+
-p:ReferenceType=${{ parameters.referenceType }}
102+
-p:Configuration=${{ parameters.buildConfiguration }}
103+
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
104+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
105+
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
106+
-p:TestResultsFolderPath=TestResults
102107
103-
- task: DotNetCoreCLI@2
104-
displayName: 'Run Flaky Unit Tests ${{parameters.msbuildArchitecture }}'
105-
condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
106-
inputs:
107-
command: build
108-
projects: build.proj
109-
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
110-
arguments: >-
111-
-t:TestSqlClientUnit
112-
-p:TestFramework=${{ parameters.targetFramework }}
113-
-p:Configuration=${{ parameters.buildConfiguration }}
114-
-p:TestFilters="category=flaky"
115-
-p:TestResultsFolderPath=TestResults
116-
-p:TestCodeCoverage=false
117-
${{ else }}: # x86
118-
arguments: >-
119-
-t:TestSqlClientUnit
120-
-p:TestFramework=${{ parameters.targetFramework }}
121-
-p:Configuration=${{ parameters.buildConfiguration }}
122-
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
123-
-p:TestFilters="category=flaky"
124-
-p:TestResultsFolderPath=TestResults
125-
-p:TestCodeCoverage=false
126-
continueOnError: true
108+
- task: DotNetCoreCLI@2
109+
displayName: 'Run Flaky Unit Tests ${{parameters.msbuildArchitecture }}'
110+
condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
111+
inputs:
112+
command: build
113+
projects: build.proj
114+
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
115+
arguments: >-
116+
-t:TestSqlClientUnit
117+
-p:TestFramework=${{ parameters.targetFramework }}
118+
-p:ReferenceType=${{ parameters.referenceType }}
119+
-p:Configuration=${{ parameters.buildConfiguration }}
120+
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
121+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
122+
-p:TestFilters="category=flaky"
123+
-p:TestResultsFolderPath=TestResults
124+
-p:TestCodeCoverage=false
125+
${{ else }}: # x86
126+
arguments: >-
127+
-t:TestSqlClientUnit
128+
-p:TestFramework=${{ parameters.targetFramework }}
129+
-p:ReferenceType=${{ parameters.referenceType }}
130+
-p:Configuration=${{ parameters.buildConfiguration }}
131+
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
132+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
133+
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
134+
-p:TestFilters="category=flaky"
135+
-p:TestResultsFolderPath=TestResults
136+
-p:TestCodeCoverage=false
137+
continueOnError: true
127138

128139
- task: DotNetCoreCLI@2
129140
displayName: 'Run Functional Tests ${{parameters.msbuildArchitecture }}'
@@ -261,33 +272,38 @@ steps:
261272
continueOnError: true
262273

263274
- ${{ else }}: # Linux or macOS
264-
- ${{if eq(parameters.referenceType, 'Project')}}:
265-
- task: DotNetCoreCLI@2
266-
displayName: 'Run Unit Tests'
267-
condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
268-
inputs:
269-
command: build
270-
projects: build.proj
271-
arguments: >-
272-
-t:TestSqlClientUnit
273-
-p:TestFramework=${{ parameters.targetFramework }}
274-
-p:Configuration=${{ parameters.buildConfiguration }}
275-
-p:TestResultsFolderPath=TestResults
275+
- task: DotNetCoreCLI@2
276+
displayName: 'Run Unit Tests'
277+
condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
278+
inputs:
279+
command: build
280+
projects: build.proj
281+
arguments: >-
282+
-t:TestSqlClientUnit
283+
-p:TestFramework=${{ parameters.targetFramework }}
284+
-p:ReferenceType=${{ parameters.referenceType }}
285+
-p:Configuration=${{ parameters.buildConfiguration }}
286+
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
287+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
288+
-p:TestResultsFolderPath=TestResults
276289
277-
- task: DotNetCoreCLI@2
278-
displayName: 'Run Flaky Unit Tests'
279-
condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
280-
inputs:
281-
command: build
282-
projects: build.proj
283-
arguments: >-
284-
-t:TestSqlClientUnit
285-
-p:TestFramework=${{ parameters.targetFramework }}
286-
-p:Configuration=${{ parameters.buildConfiguration }}
287-
-p:TestFilters="category=flaky"
288-
-p:TestResultsFolderPath=TestResults
289-
-p:TestCodeCoverage=false
290-
continueOnError: true
290+
- task: DotNetCoreCLI@2
291+
displayName: 'Run Flaky Unit Tests'
292+
condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
293+
inputs:
294+
command: build
295+
projects: build.proj
296+
arguments: >-
297+
-t:TestSqlClientUnit
298+
-p:TestFramework=${{ parameters.targetFramework }}
299+
-p:ReferenceType=${{ parameters.referenceType }}
300+
-p:Configuration=${{ parameters.buildConfiguration }}
301+
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
302+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
303+
-p:TestFilters="category=flaky"
304+
-p:TestResultsFolderPath=TestResults
305+
-p:TestCodeCoverage=false
306+
continueOnError: true
291307

292308
- task: DotNetCoreCLI@2
293309
displayName: 'Run Functional Tests'

0 commit comments

Comments
 (0)