Skip to content

Commit f25ab87

Browse files
avsejavsej
committed
libcouchbase: swap windows/linux
1 parent da714fd commit f25ab87

4 files changed

Lines changed: 135 additions & 135 deletions

File tree

‎libcouchbase/Jenkinsfile.erb‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -361,76 +361,6 @@ pipeline {
361361
}
362362
}
363363

364-
<% unless ENV['WINDOWS_ONLY'] %>
365-
stage('nix') {
366-
matrix {
367-
axes {
368-
axis {
369-
name 'PLATFORM'
370-
values <%= nix_test_builds.map { |(label, dist, relno, arch)| label.inspect }.join(", ") %>
371-
}
372-
}
373-
374-
agent { label PLATFORM }
375-
stages {
376-
stage("prep") {
377-
steps {
378-
dir("ws_${PLATFORM}") {
379-
deleteDir()
380-
unstash 'libcouchbase'
381-
}
382-
}
383-
}
384-
stage('build') {
385-
environment {
386-
CMAKE_BUILD_PARALLEL_LEVEL=8
387-
}
388-
steps {
389-
dir("ws_${PLATFORM}") {
390-
dir('build') {
391-
sh('cmake -DCMAKE_BUILD_TYPE=<%= reltype %> ../libcouchbase')
392-
sh("cmake --build . --target all ${VERBOSE.toBoolean() ? '--verbose' : ''}")
393-
sh("cmake --build . --target alltests ${VERBOSE.toBoolean() ? '--verbose' : ''}")
394-
}
395-
}
396-
stash(includes: "ws_${PLATFORM}/", name: "${PLATFORM}_build")
397-
}
398-
}
399-
stage('test') {
400-
<% if integration_enabled %>
401-
when {
402-
expression {
403-
return !SKIP_TESTS.toBoolean()
404-
}
405-
}
406-
<% end %>
407-
options {
408-
timeout(time: 60, unit: 'MINUTES')
409-
}
410-
environment {
411-
<% if gtest_shuffle %>
412-
GTEST_SHUFFLE=1
413-
<% end %>
414-
CTEST_PARALLEL_LEVEL=1
415-
CTEST_OUTPUT_ON_FAILURE=1
416-
}
417-
post {
418-
always {
419-
junit(testResults: "ws_${PLATFORM}/build/*.xml", allowEmptyResults: true)
420-
}
421-
}
422-
steps {
423-
dir("ws_${PLATFORM}/build") {
424-
sh("ctest --label-exclude contaminating ${VERBOSE.toBoolean() ? '--extra-verbose' : ''}")
425-
sh("ctest --label-exclude normal ${VERBOSE.toBoolean() ? '--extra-verbose' : ''}")
426-
}
427-
}
428-
}
429-
}
430-
}
431-
}
432-
<% end %>
433-
434364
<% unless ENV['LINUX_ONLY'] %>
435365
stage('win') {
436366
matrix {
@@ -565,6 +495,76 @@ del "%CMAKE_ZIP_FILE%"
565495
}
566496
<% end %>
567497

498+
<% unless ENV['WINDOWS_ONLY'] %>
499+
stage('nix') {
500+
matrix {
501+
axes {
502+
axis {
503+
name 'PLATFORM'
504+
values <%= nix_test_builds.map { |(label, dist, relno, arch)| label.inspect }.join(", ") %>
505+
}
506+
}
507+
508+
agent { label PLATFORM }
509+
stages {
510+
stage("prep") {
511+
steps {
512+
dir("ws_${PLATFORM}") {
513+
deleteDir()
514+
unstash 'libcouchbase'
515+
}
516+
}
517+
}
518+
stage('build') {
519+
environment {
520+
CMAKE_BUILD_PARALLEL_LEVEL=8
521+
}
522+
steps {
523+
dir("ws_${PLATFORM}") {
524+
dir('build') {
525+
sh('cmake -DCMAKE_BUILD_TYPE=<%= reltype %> ../libcouchbase')
526+
sh("cmake --build . --target all ${VERBOSE.toBoolean() ? '--verbose' : ''}")
527+
sh("cmake --build . --target alltests ${VERBOSE.toBoolean() ? '--verbose' : ''}")
528+
}
529+
}
530+
stash(includes: "ws_${PLATFORM}/", name: "${PLATFORM}_build")
531+
}
532+
}
533+
stage('test') {
534+
<% if integration_enabled %>
535+
when {
536+
expression {
537+
return !SKIP_TESTS.toBoolean()
538+
}
539+
}
540+
<% end %>
541+
options {
542+
timeout(time: 60, unit: 'MINUTES')
543+
}
544+
environment {
545+
<% if gtest_shuffle %>
546+
GTEST_SHUFFLE=1
547+
<% end %>
548+
CTEST_PARALLEL_LEVEL=1
549+
CTEST_OUTPUT_ON_FAILURE=1
550+
}
551+
post {
552+
always {
553+
junit(testResults: "ws_${PLATFORM}/build/*.xml", allowEmptyResults: true)
554+
}
555+
}
556+
steps {
557+
dir("ws_${PLATFORM}/build") {
558+
sh("ctest --label-exclude contaminating ${VERBOSE.toBoolean() ? '--extra-verbose' : ''}")
559+
sh("ctest --label-exclude normal ${VERBOSE.toBoolean() ? '--extra-verbose' : ''}")
560+
}
561+
}
562+
}
563+
}
564+
}
565+
}
566+
<% end %>
567+
568568
<% if integration_enabled %>
569569
stage('int') {
570570
when {

‎libcouchbase/lcb-lnx-scripted-build-pipeline.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ pipeline {
271271
}
272272
}
273273

274+
274275
stage('nix') {
275276
matrix {
276277
axes {
@@ -334,7 +335,6 @@ pipeline {
334335
}
335336
}
336337

337-
338338
stage('int') {
339339
when {
340340
expression {

‎libcouchbase/lcb-scripted-build-pipeline.groovy‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -271,69 +271,6 @@ pipeline {
271271
}
272272
}
273273

274-
stage('nix') {
275-
matrix {
276-
axes {
277-
axis {
278-
name 'PLATFORM'
279-
values "ubuntu20", "debian12", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
280-
}
281-
}
282-
283-
agent { label PLATFORM }
284-
stages {
285-
stage("prep") {
286-
steps {
287-
dir("ws_${PLATFORM}") {
288-
deleteDir()
289-
unstash 'libcouchbase'
290-
}
291-
}
292-
}
293-
stage('build') {
294-
environment {
295-
CMAKE_BUILD_PARALLEL_LEVEL=8
296-
}
297-
steps {
298-
dir("ws_${PLATFORM}") {
299-
dir('build') {
300-
sh('cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../libcouchbase')
301-
sh("cmake --build . --target all ${VERBOSE.toBoolean() ? '--verbose' : ''}")
302-
sh("cmake --build . --target alltests ${VERBOSE.toBoolean() ? '--verbose' : ''}")
303-
}
304-
}
305-
stash(includes: "ws_${PLATFORM}/", name: "${PLATFORM}_build")
306-
}
307-
}
308-
stage('test') {
309-
when {
310-
expression {
311-
return !SKIP_TESTS.toBoolean()
312-
}
313-
}
314-
options {
315-
timeout(time: 60, unit: 'MINUTES')
316-
}
317-
environment {
318-
CTEST_PARALLEL_LEVEL=1
319-
CTEST_OUTPUT_ON_FAILURE=1
320-
}
321-
post {
322-
always {
323-
junit(testResults: "ws_${PLATFORM}/build/*.xml", allowEmptyResults: true)
324-
}
325-
}
326-
steps {
327-
dir("ws_${PLATFORM}/build") {
328-
sh("ctest --label-exclude contaminating ${VERBOSE.toBoolean() ? '--extra-verbose' : ''}")
329-
sh("ctest --label-exclude normal ${VERBOSE.toBoolean() ? '--extra-verbose' : ''}")
330-
}
331-
}
332-
}
333-
}
334-
}
335-
}
336-
337274
stage('win') {
338275
matrix {
339276
axes {
@@ -454,6 +391,69 @@ del "%CMAKE_ZIP_FILE%"
454391
}
455392
}
456393

394+
stage('nix') {
395+
matrix {
396+
axes {
397+
axis {
398+
name 'PLATFORM'
399+
values "ubuntu20", "debian12", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
400+
}
401+
}
402+
403+
agent { label PLATFORM }
404+
stages {
405+
stage("prep") {
406+
steps {
407+
dir("ws_${PLATFORM}") {
408+
deleteDir()
409+
unstash 'libcouchbase'
410+
}
411+
}
412+
}
413+
stage('build') {
414+
environment {
415+
CMAKE_BUILD_PARALLEL_LEVEL=8
416+
}
417+
steps {
418+
dir("ws_${PLATFORM}") {
419+
dir('build') {
420+
sh('cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../libcouchbase')
421+
sh("cmake --build . --target all ${VERBOSE.toBoolean() ? '--verbose' : ''}")
422+
sh("cmake --build . --target alltests ${VERBOSE.toBoolean() ? '--verbose' : ''}")
423+
}
424+
}
425+
stash(includes: "ws_${PLATFORM}/", name: "${PLATFORM}_build")
426+
}
427+
}
428+
stage('test') {
429+
when {
430+
expression {
431+
return !SKIP_TESTS.toBoolean()
432+
}
433+
}
434+
options {
435+
timeout(time: 60, unit: 'MINUTES')
436+
}
437+
environment {
438+
CTEST_PARALLEL_LEVEL=1
439+
CTEST_OUTPUT_ON_FAILURE=1
440+
}
441+
post {
442+
always {
443+
junit(testResults: "ws_${PLATFORM}/build/*.xml", allowEmptyResults: true)
444+
}
445+
}
446+
steps {
447+
dir("ws_${PLATFORM}/build") {
448+
sh("ctest --label-exclude contaminating ${VERBOSE.toBoolean() ? '--extra-verbose' : ''}")
449+
sh("ctest --label-exclude normal ${VERBOSE.toBoolean() ? '--extra-verbose' : ''}")
450+
}
451+
}
452+
}
453+
}
454+
}
455+
}
456+
457457
stage('int') {
458458
when {
459459
expression {

‎libcouchbase/lcb-win-scripted-build-pipeline.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ pipeline {
203203
}
204204
}
205205

206-
207206
stage('win') {
208207
matrix {
209208
axes {
@@ -324,5 +323,6 @@ del "%CMAKE_ZIP_FILE%"
324323
}
325324
}
326325

326+
327327
}
328328
}

0 commit comments

Comments
 (0)