Skip to content

Commit 012ea6b

Browse files
dan-hughesdan-hughes
authored
SqlRS: Enable Integration Tests (#2095)
- `SqlRS` - Re-enable integration tests.
1 parent b2d16b6 commit 012ea6b

File tree

5 files changed

+39
-19
lines changed

5 files changed

+39
-19
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
113113
- The integration test was updated to verify so that the `CurrentVersion`
114114
and `ProductVersion` strings can be converted to valid versions and
115115
that they always are higher than what we expect.
116+
- `SqlRS`
117+
- Re-enable integration tests.
116118

117119
## [17.0.0] - 2024-09-30
118120

‎azure-pipelines.yml‎

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ stages:
123123
- job: Test_Unit
124124
displayName: 'Unit'
125125
pool:
126-
vmImage: 'windows-2019'
126+
vmImage: 'windows-2022'
127127
timeoutInMinutes: 0
128128
variables:
129129
# This sets environment variable $env:SqlServerDscCI.
@@ -204,9 +204,6 @@ stages:
204204
SQL2016_WIN2019:
205205
JOB_VMIMAGE: 'windows-2019'
206206
TEST_CONFIGURATION: 'Integration_SQL2016'
207-
SQL2016_WIN2022:
208-
JOB_VMIMAGE: 'windows-2022'
209-
TEST_CONFIGURATION: 'Integration_SQL2016'
210207
SQL2017_WIN2019:
211208
JOB_VMIMAGE: 'windows-2019'
212209
TEST_CONFIGURATION: 'Integration_SQL2017'
@@ -219,12 +216,18 @@ stages:
219216
SQL2019_WIN2022:
220217
JOB_VMIMAGE: 'windows-2022'
221218
TEST_CONFIGURATION: 'Integration_SQL2019'
219+
SQL2019_WIN2025:
220+
JOB_VMIMAGE: 'windows-2025'
221+
TEST_CONFIGURATION: 'Integration_SQL2019'
222222
SQL2022_WIN2019:
223223
JOB_VMIMAGE: 'windows-2019'
224224
TEST_CONFIGURATION: 'Integration_SQL2022'
225225
SQL2022_WIN2022:
226226
JOB_VMIMAGE: 'windows-2022'
227227
TEST_CONFIGURATION: 'Integration_SQL2022'
228+
SQL2022_WIN2025:
229+
JOB_VMIMAGE: 'windows-2025'
230+
TEST_CONFIGURATION: 'Integration_SQL2022'
228231
pool:
229232
vmImage: $(JOB_VMIMAGE)
230233
timeoutInMinutes: 0
@@ -289,12 +292,18 @@ stages:
289292
SQL2019_WIN2022:
290293
JOB_VMIMAGE: 'windows-2022'
291294
TEST_CONFIGURATION: 'Integration_SQL2019_RS'
295+
SQL2019_WIN2025:
296+
JOB_VMIMAGE: 'windows-2025'
297+
TEST_CONFIGURATION: 'Integration_SQL2019_RS'
292298
SQL2022_WIN2019:
293299
JOB_VMIMAGE: 'windows-2019'
294300
TEST_CONFIGURATION: 'Integration_SQL2022_RS'
295301
SQL2022_WIN2022:
296302
JOB_VMIMAGE: 'windows-2022'
297303
TEST_CONFIGURATION: 'Integration_SQL2022_RS'
304+
SQL2022_WIN2025:
305+
JOB_VMIMAGE: 'windows-2025'
306+
TEST_CONFIGURATION: 'Integration_SQL2022_RS'
298307
pool:
299308
vmImage: $(JOB_VMIMAGE)
300309
timeoutInMinutes: 0
@@ -352,12 +361,15 @@ stages:
352361
displayName: 'Commands'
353362
strategy:
354363
matrix:
355-
SQL2022_WIN2019:
364+
PowerBI_WIN2019:
356365
JOB_VMIMAGE: 'windows-2019'
357366
TEST_CONFIGURATION: 'Integration_PowerBI'
358-
SQL2022_WIN2022:
367+
PowerBI_WIN2022:
359368
JOB_VMIMAGE: 'windows-2022'
360369
TEST_CONFIGURATION: 'Integration_PowerBI'
370+
PowerBI_WIN2025:
371+
JOB_VMIMAGE: 'windows-2025'
372+
TEST_CONFIGURATION: 'Integration_PowerBI'
361373
pool:
362374
vmImage: $(JOB_VMIMAGE)
363375
timeoutInMinutes: 0
@@ -418,9 +430,6 @@ stages:
418430
SQL2016_WIN2019:
419431
JOB_VMIMAGE: 'windows-2019'
420432
TEST_CONFIGURATION: 'Integration_SQL2016'
421-
SQL2016_WIN2022:
422-
JOB_VMIMAGE: 'windows-2022'
423-
TEST_CONFIGURATION: 'Integration_SQL2016'
424433
SQL2017_WIN2019:
425434
JOB_VMIMAGE: 'windows-2019'
426435
TEST_CONFIGURATION: 'Integration_SQL2017'
@@ -433,12 +442,18 @@ stages:
433442
SQL2019_WIN2022:
434443
JOB_VMIMAGE: 'windows-2022'
435444
TEST_CONFIGURATION: 'Integration_SQL2019'
445+
SQL2019_WIN2025:
446+
JOB_VMIMAGE: 'windows-2025'
447+
TEST_CONFIGURATION: 'Integration_SQL2019'
436448
SQL2022_WIN2019:
437449
JOB_VMIMAGE: 'windows-2019'
438450
TEST_CONFIGURATION: 'Integration_SQL2022'
439451
SQL2022_WIN2022:
440452
JOB_VMIMAGE: 'windows-2022'
441453
TEST_CONFIGURATION: 'Integration_SQL2022'
454+
SQL2022_WIN2025:
455+
JOB_VMIMAGE: 'windows-2025'
456+
TEST_CONFIGURATION: 'Integration_SQL2022'
442457
pool:
443458
vmImage: $(JOB_VMIMAGE)
444459
timeoutInMinutes: 0
@@ -517,8 +532,8 @@ stages:
517532
displayName: 'Integration'
518533
strategy:
519534
matrix:
520-
SQL2016_WIN2022:
521-
JOB_VMIMAGE: 'windows-2022'
535+
SQL2016_WIN2019:
536+
JOB_VMIMAGE: 'windows-2019'
522537
TEST_CONFIGURATION: 'Integration_SQL2016'
523538
SQL2017_WIN2022:
524539
JOB_VMIMAGE: 'windows-2022'
@@ -613,9 +628,6 @@ stages:
613628
SQL2016_WIN2019:
614629
JOB_VMIMAGE: 'windows-2019'
615630
TEST_CONFIGURATION: 'Integration_SQL2016'
616-
SQL2016_WIN2022:
617-
JOB_VMIMAGE: 'windows-2022'
618-
TEST_CONFIGURATION: 'Integration_SQL2016'
619631
SQL2017_WIN2019:
620632
JOB_VMIMAGE: 'windows-2019'
621633
TEST_CONFIGURATION: 'Integration_SQL2017'
@@ -628,12 +640,18 @@ stages:
628640
SQL2019_WIN2022:
629641
JOB_VMIMAGE: 'windows-2022'
630642
TEST_CONFIGURATION: 'Integration_SQL2019'
643+
SQL2019_WIN2025:
644+
JOB_VMIMAGE: 'windows-2025'
645+
TEST_CONFIGURATION: 'Integration_SQL2019'
631646
SQL2022_WIN2019:
632647
JOB_VMIMAGE: 'windows-2019'
633648
TEST_CONFIGURATION: 'Integration_SQL2022'
634649
SQL2022_WIN2022:
635650
JOB_VMIMAGE: 'windows-2022'
636651
TEST_CONFIGURATION: 'Integration_SQL2022'
652+
SQL2022_WIN2025:
653+
JOB_VMIMAGE: 'windows-2025'
654+
TEST_CONFIGURATION: 'Integration_SQL2022'
637655
variables:
638656
SKIP_DATABASE_ENGINE_DEFAULT_INSTANCE: true
639657
SKIP_ANALYSIS_MULTI_INSTANCE: true
@@ -690,8 +708,8 @@ stages:
690708
displayName: 'Integration'
691709
strategy:
692710
matrix:
693-
SQL2016_WIN2022:
694-
JOB_VMIMAGE: 'windows-2022'
711+
SQL2016_WIN2019:
712+
JOB_VMIMAGE: 'windows-2019'
695713
TEST_CONFIGURATION: 'Integration_SQL2016'
696714
SQL2017_WIN2022:
697715
JOB_VMIMAGE: 'windows-2022'

‎tests/Integration/Resources/DSC_SqlRS.Integration.Tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ AfterAll {
7979
}
8080

8181
# TODO: SQL Server 2022 has been disabled due to unknown issue with the resource SqlRS. See issue #2009.
82-
Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019'<#, 'Integration_SQL2022'#>) {
82+
Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') {
8383
BeforeAll {
8484
$resourceId = "[$($script:dscResourceFriendlyName)]Integration_Test"
8585
}

‎tests/Integration/Resources/DSC_SqlRS_Default.Integration.Tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ AfterAll {
7979
}
8080

8181
# TODO: SQL Server 2022 has been disabled due to unknown issue with the resource SqlRS. See issue #2009.
82-
Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019'<#, 'Integration_SQL2022'#>) {
82+
Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') {
8383
BeforeAll {
8484
$resourceId = "[$($script:dscResourceFriendlyName)]Integration_Test"
8585
}

‎tests/Unit/DSC_SqlSetup.Tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BeforeDiscovery {
1818
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1919
{
2020
# Redirect all streams to $null, except the error stream (stream 2)
21-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
21+
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 3>&1 4>&1 5>&1 6>&1 > $null
2222
}
2323

2424
# If the dependencies has not been resolved, this will throw an error.

0 commit comments

Comments
 (0)