Skip to content

Commit 185faa9

Browse files
committed
(MAINT) Fix broken Jenkins Pipeline
1 parent 59f4b5e commit 185faa9

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

spec/acceptance/z_last_sqlserver_features_spec.rb

+4-3
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,10 @@ def bind_and_apply_failing_manifest(features, ensure_val = 'present')
217217
ensure_sql_features(features)
218218

219219
validate_sql_install(host, {:version => sql_version}) do |r|
220-
expect(r.stdout).to match(/Client Tools Connectivity/)
221-
expect(r.stdout).to match(/Client Tools Backwards Compatibility/)
222-
expect(r.stdout).to match(/Client Tools SDK/)
220+
# SQL Server 2016 will not install the client tools features.
221+
expect(r.stdout).to match(/Client Tools Connectivity/) unless sql_version.to_i >= 2016
222+
expect(r.stdout).to match(/Client Tools Backwards Compatibility/) unless sql_version.to_i >= 2016
223+
expect(r.stdout).to match(/Client Tools SDK/) unless sql_version.to_i >= 2016
223224
expect(r.stdout).to match(/Integration Services/)
224225
expect(r.stdout).to match(/Master Data Services/)
225226
end

0 commit comments

Comments
 (0)