Skip to content

Commit cb3084f

Browse files
avsejavsej
committed
libcouchbase: try to fix aarch64 for amazon2
1 parent 822b3f8 commit cb3084f

3 files changed

Lines changed: 27 additions & 106 deletions

File tree

‎libcouchbase/Jenkinsfile.erb‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ windows_dists = [
55
[2017, 15],
66
]
77
centos_dists = [
8-
['centos', 7, 'x86_64', 64, 'epel-7-x86_64'],
8+
# ['centos', 7, 'x86_64', 64, 'epel-7-x86_64'],
99
]
1010

1111
ubuntu_dists = [
@@ -24,7 +24,7 @@ nix_test_builds = [
2424
['debian9', 'debian', 9, 'x64'],
2525
# Error: Failed to download metadata for repo 'baseos': Cannot prepare internal mirrorlist: No URLs in mirrorlist
2626
# ['centos8', 'centos', 8, 'x64'],
27-
['centos7', 'centos', 7, 'x64'],
27+
2828
['rockylinux9', 'rockylinux', 9, 'x64'],
2929
['m1', 'macos', 11, 'm1'],
3030
# ['macos-11.0', 'macos', 11, 'x64'],
@@ -48,9 +48,10 @@ if ENV['WINDOWS_ONLY']
4848
elsif ENV['LINUX_ONLY']
4949
windows_dists = []
5050
centos_dists = [
51-
['centos', 7, 'x86_64', 64, 'epel-7-x86_64'],
51+
# ['centos', 7, 'x86_64', 64, 'epel-7-x86_64'],
5252
['rhel', 8, 'x86_64', 64, 'rocky-8-x86_64'],
5353
['rhel', 9, 'x86_64', 64, 'rocky+epel-9-x86_64'],
54+
['amzn', 2, 'aarch64', 64, 'amazonlinux-2-aarch64'],
5455
['amzn', 2, 'x86_64', 64, 'amazonlinux-2-x86_64'],
5556
['amzn', 2023, 'x86_64', 64, 'amazonlinux-2023-x86_64'],
5657
]
@@ -637,6 +638,7 @@ pipeline {
637638
stage('<%= name[0] %><%= bits %>v<%= relno %>') {
638639
steps {
639640
dir('ws_<%= name %><%= relno %>-<%= bits %>') {
641+
sh("sudo dnf install -y qemu")
640642
sh("sudo chown couchbase:couchbase -R .")
641643
deleteDir()
642644
unstash 'libcouchbase'

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

Lines changed: 21 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ pipeline {
276276
axes {
277277
axis {
278278
name 'PLATFORM'
279-
values "ubuntu20", "debian9", "centos7", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
279+
values "ubuntu20", "debian9", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
280280
}
281281
}
282282

@@ -420,12 +420,13 @@ pipeline {
420420
}
421421
}
422422
parallel {
423-
stage('centos7 x86_64') {
423+
stage('rhel8 x86_64') {
424424
agent { label 'mock' }
425425
stages {
426-
stage('c64v7') {
426+
stage('r64v8') {
427427
steps {
428-
dir('ws_centos7-64') {
428+
dir('ws_rhel8-64') {
429+
sh("sudo dnf install -y qemu")
429430
sh("sudo chown couchbase:couchbase -R .")
430431
deleteDir()
431432
unstash 'libcouchbase'
@@ -434,22 +435,23 @@ pipeline {
434435
}
435436
stage('srpm') {
436437
steps {
437-
package_srpm("centos", 64, 7, "x86_64", "epel-7-x86_64", VERSION)
438+
package_srpm("rhel", 64, 8, "x86_64", "rocky-8-x86_64", VERSION)
438439
}
439440
}
440441
stage('rpm') {
441442
steps {
442-
package_rpm("centos", 64, 7, "x86_64", "epel-7-x86_64", VERSION)
443+
package_rpm("rhel", 64, 8, "x86_64", "rocky-8-x86_64", VERSION)
443444
}
444445
}
445446
}
446447
}
447-
stage('rhel8 x86_64') {
448+
stage('rhel9 x86_64') {
448449
agent { label 'mock' }
449450
stages {
450-
stage('r64v8') {
451+
stage('r64v9') {
451452
steps {
452-
dir('ws_rhel8-64') {
453+
dir('ws_rhel9-64') {
454+
sh("sudo dnf install -y qemu")
453455
sh("sudo chown couchbase:couchbase -R .")
454456
deleteDir()
455457
unstash 'libcouchbase'
@@ -458,22 +460,23 @@ pipeline {
458460
}
459461
stage('srpm') {
460462
steps {
461-
package_srpm("rhel", 64, 8, "x86_64", "rocky-8-x86_64", VERSION)
463+
package_srpm("rhel", 64, 9, "x86_64", "rocky+epel-9-x86_64", VERSION)
462464
}
463465
}
464466
stage('rpm') {
465467
steps {
466-
package_rpm("rhel", 64, 8, "x86_64", "rocky-8-x86_64", VERSION)
468+
package_rpm("rhel", 64, 9, "x86_64", "rocky+epel-9-x86_64", VERSION)
467469
}
468470
}
469471
}
470472
}
471-
stage('rhel9 x86_64') {
473+
stage('amzn2 aarch64') {
472474
agent { label 'mock' }
473475
stages {
474-
stage('r64v9') {
476+
stage('a64v2') {
475477
steps {
476-
dir('ws_rhel9-64') {
478+
dir('ws_amzn2-64') {
479+
sh("sudo dnf install -y qemu")
477480
sh("sudo chown couchbase:couchbase -R .")
478481
deleteDir()
479482
unstash 'libcouchbase'
@@ -482,12 +485,12 @@ pipeline {
482485
}
483486
stage('srpm') {
484487
steps {
485-
package_srpm("rhel", 64, 9, "x86_64", "rocky+epel-9-x86_64", VERSION)
488+
package_srpm("amzn", 64, 2, "aarch64", "amazonlinux-2-aarch64", VERSION)
486489
}
487490
}
488491
stage('rpm') {
489492
steps {
490-
package_rpm("rhel", 64, 9, "x86_64", "rocky+epel-9-x86_64", VERSION)
493+
package_rpm("amzn", 64, 2, "aarch64", "amazonlinux-2-aarch64", VERSION)
491494
}
492495
}
493496
}
@@ -498,6 +501,7 @@ pipeline {
498501
stage('a64v2') {
499502
steps {
500503
dir('ws_amzn2-64') {
504+
sh("sudo dnf install -y qemu")
501505
sh("sudo chown couchbase:couchbase -R .")
502506
deleteDir()
503507
unstash 'libcouchbase'
@@ -522,6 +526,7 @@ pipeline {
522526
stage('a64v2023') {
523527
steps {
524528
dir('ws_amzn2023-64') {
529+
sh("sudo dnf install -y qemu")
525530
sh("sudo chown couchbase:couchbase -R .")
526531
deleteDir()
527532
unstash 'libcouchbase'
@@ -746,37 +751,6 @@ pipeline {
746751
}
747752
}
748753
}
749-
stage('amzn2') {
750-
when {
751-
expression {
752-
return !IS_GERRIT_TRIGGER.toBoolean()
753-
}
754-
}
755-
matrix {
756-
axes {
757-
axis {
758-
name 'PLATFORM'
759-
values 'aarch64'
760-
}
761-
}
762-
agent { label PLATFORM == 'x86_64' ? 'amzn2' : 'qe-grav2-amzn2' }
763-
stages {
764-
stage('rpm') {
765-
steps {
766-
sh('sudo yum erase -y openssl-devel; sudo yum install -y openssl11-devel rpm-build yum-utils; cat /etc/os-release')
767-
unstash('centos7-srpm')
768-
sh('sudo yum-builddep -y libcouchbase-*/*.src.rpm')
769-
sh('sudo rm -rf output; rpmbuild --rebuild libcouchbase-*/*.src.rpm -D "_rpmdir output"')
770-
dir('output') {
771-
sh("mv ${PLATFORM} libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}")
772-
sh("tar cf libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}.tar libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}")
773-
archiveArtifacts(artifacts: "libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}.tar", fingerprint: true)
774-
}
775-
}
776-
}
777-
}
778-
}
779-
}
780754
stage('repositories') {
781755
when {
782756
expression {

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

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ pipeline {
276276
axes {
277277
axis {
278278
name 'PLATFORM'
279-
values "ubuntu20", "debian9", "centos7", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
279+
values "ubuntu20", "debian9", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
280280
}
281281
}
282282

@@ -513,30 +513,6 @@ pipeline {
513513
}
514514
}
515515
parallel {
516-
stage('centos7 x86_64') {
517-
agent { label 'mock' }
518-
stages {
519-
stage('c64v7') {
520-
steps {
521-
dir('ws_centos7-64') {
522-
sh("sudo chown couchbase:couchbase -R .")
523-
deleteDir()
524-
unstash 'libcouchbase'
525-
}
526-
}
527-
}
528-
stage('srpm') {
529-
steps {
530-
package_srpm("centos", 64, 7, "x86_64", "epel-7-x86_64", VERSION)
531-
}
532-
}
533-
stage('rpm') {
534-
steps {
535-
package_rpm("centos", 64, 7, "x86_64", "epel-7-x86_64", VERSION)
536-
}
537-
}
538-
}
539-
}
540516
stage('ubuntu1804 amd64') {
541517
agent { label 'cowbuilder' }
542518
stages {
@@ -641,36 +617,5 @@ pipeline {
641617
}
642618
}
643619
}
644-
stage('amzn2') {
645-
when {
646-
expression {
647-
return !IS_GERRIT_TRIGGER.toBoolean()
648-
}
649-
}
650-
matrix {
651-
axes {
652-
axis {
653-
name 'PLATFORM'
654-
values 'aarch64'
655-
}
656-
}
657-
agent { label PLATFORM == 'x86_64' ? 'amzn2' : 'qe-grav2-amzn2' }
658-
stages {
659-
stage('rpm') {
660-
steps {
661-
sh('sudo yum erase -y openssl-devel; sudo yum install -y openssl11-devel rpm-build yum-utils; cat /etc/os-release')
662-
unstash('centos7-srpm')
663-
sh('sudo yum-builddep -y libcouchbase-*/*.src.rpm')
664-
sh('sudo rm -rf output; rpmbuild --rebuild libcouchbase-*/*.src.rpm -D "_rpmdir output"')
665-
dir('output') {
666-
sh("mv ${PLATFORM} libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}")
667-
sh("tar cf libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}.tar libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}")
668-
archiveArtifacts(artifacts: "libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}.tar", fingerprint: true)
669-
}
670-
}
671-
}
672-
}
673-
}
674-
}
675620
}
676621
}

0 commit comments

Comments
 (0)