Skip to content

SQLRS Enable Integration Tests #2095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johlju merged 14 commits into from
Apr 22, 2025
Merged

SQLRS Enable Integration Tests #2095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6407dca
Re-enable RS 2022
dan-hughes Apr 16, 2025
6176457
Minimize integration tests for testing 2022
dan-hughes Apr 16, 2025
9aa84de
Update changelog
dan-hughes Apr 16, 2025
02d3c0e
Fix stream redirection
dan-hughes Apr 16, 2025
049d234
Disable some tests for CI execution
dan-hughes Apr 16, 2025
b1f7ff5
Remove more test runs
dan-hughes Apr 16, 2025
c9bc012
Move unit tests to 2022 image
dan-hughes Apr 16, 2025
d4524a8
Merge branch 'issue-2009' of https://github.com/dan-hughes/SqlServerD…
dan-hughes Apr 17, 2025
67b77ea
Revert "Remove more test runs"
dan-hughes Apr 17, 2025
e674faf
Revert "Disable some tests for CI execution"
dan-hughes Apr 17, 2025
09cba35
Revert "Minimize integration tests for testing 2022"
dan-hughes Apr 17, 2025
331115e
Ad 2025 images, run SQL 2016 on supported OS
dan-hughes Apr 17, 2025
06bebc9
Update PBI matrix name
dan-hughes Apr 20, 2025
0990ce8
Merge branch 'main' into issue-2009
johlju Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- The integration test was updated to verify so that the `CurrentVersion`
and `ProductVersion` strings can be converted to valid versions and
that they always are higher than what we expect.
- `SqlRS`
- Re-enable integration tests.

## [17.0.0] - 2024-09-30

Expand Down
50 changes: 34 additions & 16 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ stages:
- job: Test_Unit
displayName: 'Unit'
pool:
vmImage: 'windows-2019'
vmImage: 'windows-2022'
timeoutInMinutes: 0
variables:
# This sets environment variable $env:SqlServerDscCI.
Expand Down Expand Up @@ -204,9 +204,6 @@ stages:
SQL2016_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2016'
SQL2016_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2016'
SQL2017_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2017'
Expand All @@ -219,12 +216,18 @@ stages:
SQL2019_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2019'
SQL2019_WIN2025:
JOB_VMIMAGE: 'windows-2025'
TEST_CONFIGURATION: 'Integration_SQL2019'
SQL2022_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2022'
SQL2022_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2022'
SQL2022_WIN2025:
JOB_VMIMAGE: 'windows-2025'
TEST_CONFIGURATION: 'Integration_SQL2022'
pool:
vmImage: $(JOB_VMIMAGE)
timeoutInMinutes: 0
Expand Down Expand Up @@ -289,12 +292,18 @@ stages:
SQL2019_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2019_RS'
SQL2019_WIN2025:
JOB_VMIMAGE: 'windows-2025'
TEST_CONFIGURATION: 'Integration_SQL2019_RS'
SQL2022_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2022_RS'
SQL2022_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2022_RS'
SQL2022_WIN2025:
JOB_VMIMAGE: 'windows-2025'
TEST_CONFIGURATION: 'Integration_SQL2022_RS'
pool:
vmImage: $(JOB_VMIMAGE)
timeoutInMinutes: 0
Expand Down Expand Up @@ -352,12 +361,15 @@ stages:
displayName: 'Commands'
strategy:
matrix:
SQL2022_WIN2019:
PowerBI_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_PowerBI'
SQL2022_WIN2022:
PowerBI_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_PowerBI'
PowerBI_WIN2025:
JOB_VMIMAGE: 'windows-2025'
TEST_CONFIGURATION: 'Integration_PowerBI'
pool:
vmImage: $(JOB_VMIMAGE)
timeoutInMinutes: 0
Expand Down Expand Up @@ -418,9 +430,6 @@ stages:
SQL2016_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2016'
SQL2016_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2016'
SQL2017_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2017'
Expand All @@ -433,12 +442,18 @@ stages:
SQL2019_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2019'
SQL2019_WIN2025:
JOB_VMIMAGE: 'windows-2025'
TEST_CONFIGURATION: 'Integration_SQL2019'
SQL2022_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2022'
SQL2022_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2022'
SQL2022_WIN2025:
JOB_VMIMAGE: 'windows-2025'
TEST_CONFIGURATION: 'Integration_SQL2022'
pool:
vmImage: $(JOB_VMIMAGE)
timeoutInMinutes: 0
Expand Down Expand Up @@ -517,8 +532,8 @@ stages:
displayName: 'Integration'
strategy:
matrix:
SQL2016_WIN2022:
JOB_VMIMAGE: 'windows-2022'
SQL2016_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2016'
SQL2017_WIN2022:
JOB_VMIMAGE: 'windows-2022'
Expand Down Expand Up @@ -613,9 +628,6 @@ stages:
SQL2016_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2016'
SQL2016_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2016'
SQL2017_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2017'
Expand All @@ -628,12 +640,18 @@ stages:
SQL2019_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2019'
SQL2019_WIN2025:
JOB_VMIMAGE: 'windows-2025'
TEST_CONFIGURATION: 'Integration_SQL2019'
SQL2022_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2022'
SQL2022_WIN2022:
JOB_VMIMAGE: 'windows-2022'
TEST_CONFIGURATION: 'Integration_SQL2022'
SQL2022_WIN2025:
JOB_VMIMAGE: 'windows-2025'
TEST_CONFIGURATION: 'Integration_SQL2022'
variables:
SKIP_DATABASE_ENGINE_DEFAULT_INSTANCE: true
SKIP_ANALYSIS_MULTI_INSTANCE: true
Expand Down Expand Up @@ -690,8 +708,8 @@ stages:
displayName: 'Integration'
strategy:
matrix:
SQL2016_WIN2022:
JOB_VMIMAGE: 'windows-2022'
SQL2016_WIN2019:
JOB_VMIMAGE: 'windows-2019'
TEST_CONFIGURATION: 'Integration_SQL2016'
SQL2017_WIN2022:
JOB_VMIMAGE: 'windows-2022'
Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/Resources/DSC_SqlRS.Integration.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ AfterAll {
}

# TODO: SQL Server 2022 has been disabled due to unknown issue with the resource SqlRS. See issue #2009.
Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019'<#, 'Integration_SQL2022'#>) {
Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') {
BeforeAll {
$resourceId = "[$($script:dscResourceFriendlyName)]Integration_Test"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/Resources/DSC_SqlRS_Default.Integration.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ AfterAll {
}

# TODO: SQL Server 2022 has been disabled due to unknown issue with the resource SqlRS. See issue #2009.
Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019'<#, 'Integration_SQL2022'#>) {
Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') {
BeforeAll {
$resourceId = "[$($script:dscResourceFriendlyName)]Integration_Test"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/DSC_SqlSetup.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ BeforeDiscovery {
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
{
# Redirect all streams to $null, except the error stream (stream 2)
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 3>&1 4>&1 5>&1 6>&1 > $null
}

# If the dependencies has not been resolved, this will throw an error.
Expand Down
Loading