Skip to content

Commit 293e33c

Browse files
committed
enable integration tests for 5.x on azure pipelines
1 parent 03afd79 commit 293e33c

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

azure-pipelines.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,17 @@ jobs:
2323
testResultsFiles: 'src/Tests/Tests/**/*.trx'
2424
testRunTitle: Windows Unit Tests
2525

26-
# Enable this when backporting to 7.x 6.x and 5.x, master not in integratable state until 7.x stabalizes and merged to master again
27-
#- job: WindowsIntegrationTests
28-
# dependsOn: WindowsCanaryTests
29-
# pool:
30-
# vmImage: 'vs2017-win2016'
31-
# strategy:
32-
# maxParallel: 5
33-
# matrix:
34-
# es653:
35-
# esVersion: '6.5.3'
36-
# es632:
37-
# esVersion: '6.3.2'
38-
# steps:
39-
# - script: 'build.bat integrate $(esVersion) skipdocs'
40-
# displayName: '$(esVersion) integration tests'
26+
- job: WindowsIntegrationTests
27+
dependsOn: WindowsCanaryTests
28+
pool:
29+
vmImage: 'vs2017-win2016'
30+
strategy:
31+
maxParallel: 5
32+
matrix:
33+
es502:
34+
esVersion: '5.0.2'
35+
es5615:
36+
esVersion: '5.6.15'
37+
steps:
38+
- script: 'build.bat integrate $(esVersion) skipdocs'
39+
displayName: '$(esVersion) integration tests'

src/Elasticsearch.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ EndProjectSection
5555
EndProject
5656
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget", "Nuget", "{C7865979-1D1C-46AF-BDE8-1DA6F3ED81B3}"
5757
ProjectSection(SolutionItems) = preProject
58-
..\build\NEST.JsonNetSerializer.nuspec = ..\build\NEST.JsonNetSerializer.nuspec
5958
..\build\NEST.nuspec = ..\build\NEST.nuspec
6059
..\NuGet.config = ..\NuGet.config
6160
..\build\Elasticsearch.Net.nuspec = ..\build\Elasticsearch.Net.nuspec

0 commit comments

Comments
 (0)