Skip to content

Commit e017326

Browse files
committed
Fixed ExportTest, adjusted Jenkinsfile
Reordered the regression stages to see if that makes a difference with getting 10 Latest to work.
1 parent a36773b commit e017326

File tree

2 files changed

+51
-40
lines changed

2 files changed

+51
-40
lines changed

Jenkinsfile

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -192,66 +192,69 @@ pipeline{
192192
'''
193193
}
194194
}
195-
stage('regressions-11') {
195+
196+
stage('regressions-10.0-10.2') {
197+
when {
198+
allOf {
199+
branch 'develop'
200+
expression {return params.regressions}
201+
}
202+
}
203+
steps {
204+
runAllTests('Release', '10.0-10.2', false)
205+
junit '**/build/**/TEST*.xml'
206+
}
207+
}
208+
209+
stage('regressions-10.0') {
210+
when {
211+
allOf {
212+
branch 'develop'
213+
expression {return params.regressions}
214+
}
215+
}
216+
steps {
217+
runAllTests('Latest', '10.0', false)
218+
junit '**/build/**/TEST*.xml'
219+
}
220+
}
221+
222+
stage('regressions-11.1.0') {
196223
when {
197-
allOf {
224+
allOf {
198225
branch 'develop'
199226
expression {return params.regressions}
200227
}
201228
}
202229
steps {
203-
runAllTests('Latest', '11', false)
230+
runAllTests('Release', '11.1.0', false)
204231
junit '**/build/**/TEST*.xml'
205232
}
206233
}
207234

208-
stage('regressions-11-reverseProxy') {
209-
when {
210-
allOf {
211-
branch 'develop'
212-
expression {return params.regressions}
213-
}
214-
}
215-
steps {
216-
runAllTests('Latest', '11', true)
217-
junit '**/build/**/TEST*.xml'
218-
}
219-
}
220-
221-
stage('regressions-10.0-10.2') {
235+
stage('regressions-11') {
222236
when {
223237
allOf {
224238
branch 'develop'
225239
expression {return params.regressions}
226240
}
227241
}
228242
steps {
229-
runAllTests('Release', '10.0-10.2', false)
230-
junit '**/build/**/TEST*.xml'
231-
}
232-
}
233-
stage('regressions-10.0') {
234-
when {
235-
allOf {
236-
branch 'develop'
237-
expression {return params.regressions}
238-
}
239-
}
240-
steps {
241-
runAllTests('Latest', '10.0', false)
243+
runAllTests('Latest', '11', false)
242244
junit '**/build/**/TEST*.xml'
243245
}
244246
}
245-
stage('regressions-11.1.0') {
246-
when {
247-
allOf {
248-
branch 'develop'
249-
expression {return params.regressions}
250-
}
251-
}
252-
steps {
253-
runAllTests('Release', '11.1.0', false)
254-
junit '**/build/**/TEST*.xml'
247+
248+
stage('regressions-11-reverseProxy') {
249+
when {
250+
allOf {
251+
branch 'develop'
252+
expression {return params.regressions}
253+
}
254+
}
255+
steps {
256+
runAllTests('Latest', '11', true)
257+
junit '**/build/**/TEST*.xml'
255258
}
256259
}
257260
}

marklogic-client-api/src/test/java/com/marklogic/client/test/rows/ExportTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.marklogic.client.test.junit5.RequiresML11;
99
import com.marklogic.client.type.CtsReferenceExpr;
1010
import com.marklogic.client.type.PlanTripleOption;
11+
import org.junit.jupiter.api.BeforeEach;
1112
import org.junit.jupiter.api.Test;
1213
import org.junit.jupiter.api.extension.ExtendWith;
1314

@@ -23,6 +24,13 @@
2324
*/
2425
public class ExportTest extends AbstractOpticUpdateTest {
2526

27+
@BeforeEach
28+
void beforeEach() {
29+
// We don't need update for any of these tests; this ensures the tests still pass on MarkLogic 10
30+
// and < 11.2.0.
31+
rowManager.withUpdate(false);
32+
}
33+
2634
@Test
2735
@ExtendWith(RequiresML11.class)
2836
public void fromDocUris() {

0 commit comments

Comments
 (0)