Skip to content

Commit

Permalink
Changes to SqlSetup
Browse files Browse the repository at this point in the history
- Changes to integration tests
  - CONN feature was temporarily removed from the instances installed by the
    integration tests. This is due to issue dsccommunity#1105.
  • Loading branch information
johlju committed Apr 22, 2018
1 parent b7399f1 commit 1afbe6a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
`/FEATURES` argument.
- Cleaned up a bit in the tests, removed excessive piping.
- Fixed minor typo in examples.
- Changes to integration tests
- CONN feature was temporarily removed from the instances installed by the
integration tests. This is due to issue #1105.
- Changes to SqlRS
- Updated the integration tests to stop the Reporting Services service after
the integration test. This is to save memory on the AppVeyor build worker.
Expand Down
26 changes: 23 additions & 3 deletions Tests/Integration/MSFT_SqlSetup.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ $ConfigurationData = @{

# Database Engine properties.
DatabaseEngineNamedInstanceName = 'DSCSQLTEST'
DatabaseEngineNamedInstanceFeatures = 'SQLENGINE,AS,CONN,BC,SDK'
<#
CONN feature:
Due to issue #1105 the feature CONN was removed.
It cannot be used here if CONN is already installed
in the AppVeyor build worker.
#>
DatabaseEngineNamedInstanceFeatures = 'SQLENGINE,AS,BC,SDK'
AnalysisServicesMultiServerMode = 'MULTIDIMENSIONAL'

<#
Expand All @@ -24,7 +30,14 @@ $ConfigurationData = @{
evaluate the result in the test.
#>
AnalysisServicesTabularInstanceName = 'DSCTABULAR'
AnalysisServicesTabularFeatures = 'AS,CONN,BC,SDK'

<#
CONN feature:
Due to issue #1105 the feature CONN was removed.
It cannot be used here if CONN is already installed
in the AppVeyor build worker.
#>
AnalysisServicesTabularFeatures = 'AS,BC,SDK'
AnalysisServicesTabularServerMode = 'TABULAR'

<#
Expand All @@ -35,7 +48,14 @@ $ConfigurationData = @{
evaluate the result in the test.
#>
DatabaseEngineDefaultInstanceName = 'MSSQLSERVER'
DatabaseEngineDefaultInstanceFeatures = 'SQLENGINE,CONN,BC,SDK'

<#
CONN feature:
Due to issue #1105 the feature CONN was removed.
It cannot be used here if CONN is already installed
in the AppVeyor build worker.
#>
DatabaseEngineDefaultInstanceFeatures = 'SQLENGINE,BC,SDK'

# General SqlSetup properties
Collation = 'Finnish_Swedish_CI_AS'
Expand Down

0 comments on commit 1afbe6a

Please sign in to comment.