Skip to content

Commit 57319dd

Browse files
committed
Putting MarkLogic 10 regressions at end of Jenkinsfile
1 parent e017326 commit 57319dd

File tree

2 files changed

+68
-58
lines changed

2 files changed

+68
-58
lines changed

Jenkinsfile

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -193,69 +193,70 @@ pipeline{
193193
}
194194
}
195195

196-
stage('regressions-10.0-10.2') {
197-
when {
198-
allOf {
199-
branch 'develop'
200-
expression {return params.regressions}
196+
stage('regressions-11.1.0') {
197+
when {
198+
allOf {
199+
branch 'develop'
200+
expression {return params.regressions}
201+
}
202+
}
203+
steps {
204+
runAllTests('Release', '11.1.0', false)
205+
junit '**/build/**/TEST*.xml'
206+
}
201207
}
202-
}
203-
steps {
204-
runAllTests('Release', '10.0-10.2', false)
205-
junit '**/build/**/TEST*.xml'
206-
}
207-
}
208208

209-
stage('regressions-10.0') {
210-
when {
211-
allOf {
212-
branch 'develop'
213-
expression {return params.regressions}
209+
stage('regressions-11') {
210+
when {
211+
allOf {
212+
branch 'develop'
213+
expression {return params.regressions}
214+
}
215+
}
216+
steps {
217+
runAllTests('Latest', '11', false)
218+
junit '**/build/**/TEST*.xml'
219+
}
214220
}
215-
}
216-
steps {
217-
runAllTests('Latest', '10.0', false)
218-
junit '**/build/**/TEST*.xml'
219-
}
220-
}
221221

222-
stage('regressions-11.1.0') {
223-
when {
224-
allOf {
225-
branch 'develop'
226-
expression {return params.regressions}
227-
}
228-
}
229-
steps {
230-
runAllTests('Release', '11.1.0', false)
231-
junit '**/build/**/TEST*.xml'
232-
}
233-
}
222+
stage('regressions-11-reverseProxy') {
223+
when {
224+
allOf {
225+
branch 'develop'
226+
expression {return params.regressions}
227+
}
228+
}
229+
steps {
230+
runAllTests('Latest', '11', true)
231+
junit '**/build/**/TEST*.xml'
232+
}
233+
}
234234

235-
stage('regressions-11') {
236-
when {
237-
allOf {
238-
branch 'develop'
239-
expression {return params.regressions}
240-
}
241-
}
242-
steps {
243-
runAllTests('Latest', '11', false)
244-
junit '**/build/**/TEST*.xml'
245-
}
246-
}
235+
stage('regressions-10.0') {
236+
when {
237+
allOf {
238+
branch 'develop'
239+
expression {return params.regressions}
240+
}
241+
}
242+
steps {
243+
runAllTests('Latest', '10.0', false)
244+
junit '**/build/**/TEST*.xml'
245+
}
246+
}
247247

248-
stage('regressions-11-reverseProxy') {
249-
when {
250-
allOf {
251-
branch 'develop'
252-
expression {return params.regressions}
248+
stage('regressions-10.0-10.2') {
249+
when {
250+
allOf {
251+
branch 'develop'
252+
expression {return params.regressions}
253+
}
254+
}
255+
steps {
256+
runAllTests('Release', '10.0-10.2', false)
257+
junit '**/build/**/TEST*.xml'
258+
}
253259
}
254-
}
255-
steps {
256-
runAllTests('Latest', '11', true)
257-
junit '**/build/**/TEST*.xml'
258-
}
259-
}
260+
260261
}
261262
}

marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLQueryDefinitionTest.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
import com.marklogic.client.io.JacksonHandle;
2121
import com.marklogic.client.io.StringHandle;
2222
import com.marklogic.client.semantics.*;
23+
import com.marklogic.client.test.junit5.RequiresML11;
2324
import org.junit.jupiter.api.AfterAll;
2425
import org.junit.jupiter.api.BeforeAll;
2526
import org.junit.jupiter.api.Test;
27+
import org.junit.jupiter.api.extension.ExtendWith;
2628

2729
import static org.junit.jupiter.api.Assertions.*;
2830

@@ -118,7 +120,14 @@ private ArrayNode executeAndExtractBindings(SPARQLQueryDefinition qdef) {
118120
return bindings;
119121
}
120122

121-
@Test
123+
/**
124+
* This is oddly failing on Jenkins - but not locally - with an error of:
125+
*
126+
* com.marklogic.client.FailedRequestException: Local message: failed to apply resource at /graphs/sparql: Internal Server Error.
127+
* Server Message: XDMP-CORRUPT: <http://marklogic.com/SPARQLQDefTest/r1> <http://marklogic.com/SPARQLQDefTest/p3> ?o . --
128+
* read /space/Forests/java-unittest-2/000004b1/TripleValueData: File corrupt, bad RDFValue::decodeSimpleV2, tag=32 .
129+
*/
130+
@Test
122131
public void testBindings() {
123132
String ask = "ASK FROM <http://marklogic.com/SPARQLQDefTest/g1> " +
124133
"WHERE { <http://marklogic.com/SPARQLQDefTest/r1> <http://marklogic.com/SPARQLQDefTest/p3> ?o }";

0 commit comments

Comments
 (0)