Skip to content

Commit

Permalink
libcouchbase: try to fix aarch64 for amazon2
Browse files Browse the repository at this point in the history
  • Loading branch information
@avsej
avsej committed Sep 14, 2024
1 parent 822b3f8 commit cb3084f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 106 deletions.
8 changes: 5 additions & 3 deletions libcouchbase/Jenkinsfile.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ windows_dists = [
[2017, 15],
]
centos_dists = [
['centos', 7, 'x86_64', 64, 'epel-7-x86_64'],
# ['centos', 7, 'x86_64', 64, 'epel-7-x86_64'],
]

ubuntu_dists = [
Expand All @@ -24,7 +24,7 @@ nix_test_builds = [
['debian9', 'debian', 9, 'x64'],
# Error: Failed to download metadata for repo 'baseos': Cannot prepare internal mirrorlist: No URLs in mirrorlist
# ['centos8', 'centos', 8, 'x64'],
['centos7', 'centos', 7, 'x64'],

['rockylinux9', 'rockylinux', 9, 'x64'],
['m1', 'macos', 11, 'm1'],
# ['macos-11.0', 'macos', 11, 'x64'],
Expand All @@ -48,9 +48,10 @@ if ENV['WINDOWS_ONLY']
elsif ENV['LINUX_ONLY']
windows_dists = []
centos_dists = [
['centos', 7, 'x86_64', 64, 'epel-7-x86_64'],
# ['centos', 7, 'x86_64', 64, 'epel-7-x86_64'],
['rhel', 8, 'x86_64', 64, 'rocky-8-x86_64'],
['rhel', 9, 'x86_64', 64, 'rocky+epel-9-x86_64'],
['amzn', 2, 'aarch64', 64, 'amazonlinux-2-aarch64'],
['amzn', 2, 'x86_64', 64, 'amazonlinux-2-x86_64'],
['amzn', 2023, 'x86_64', 64, 'amazonlinux-2023-x86_64'],
]
Expand Down Expand Up @@ -637,6 +638,7 @@ pipeline {
stage('<%= name[0] %><%= bits %>v<%= relno %>') {
steps {
dir('ws_<%= name %><%= relno %>-<%= bits %>') {
sh("sudo dnf install -y qemu")
sh("sudo chown couchbase:couchbase -R .")
deleteDir()
unstash 'libcouchbase'
Expand Down
68 changes: 21 additions & 47 deletions libcouchbase/lcb-lnx-scripted-build-pipeline.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ pipeline {
axes {
axis {
name 'PLATFORM'
values "ubuntu20", "debian9", "centos7", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
values "ubuntu20", "debian9", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
}
}

Expand Down Expand Up @@ -420,12 +420,13 @@ pipeline {
}
}
parallel {
stage('centos7 x86_64') {
stage('rhel8 x86_64') {
agent { label 'mock' }
stages {
stage('c64v7') {
stage('r64v8') {
steps {
dir('ws_centos7-64') {
dir('ws_rhel8-64') {
sh("sudo dnf install -y qemu")
sh("sudo chown couchbase:couchbase -R .")
deleteDir()
unstash 'libcouchbase'
Expand All @@ -434,22 +435,23 @@ pipeline {
}
stage('srpm') {
steps {
package_srpm("centos", 64, 7, "x86_64", "epel-7-x86_64", VERSION)
package_srpm("rhel", 64, 8, "x86_64", "rocky-8-x86_64", VERSION)
}
}
stage('rpm') {
steps {
package_rpm("centos", 64, 7, "x86_64", "epel-7-x86_64", VERSION)
package_rpm("rhel", 64, 8, "x86_64", "rocky-8-x86_64", VERSION)
}
}
}
}
stage('rhel8 x86_64') {
stage('rhel9 x86_64') {
agent { label 'mock' }
stages {
stage('r64v8') {
stage('r64v9') {
steps {
dir('ws_rhel8-64') {
dir('ws_rhel9-64') {
sh("sudo dnf install -y qemu")
sh("sudo chown couchbase:couchbase -R .")
deleteDir()
unstash 'libcouchbase'
Expand All @@ -458,22 +460,23 @@ pipeline {
}
stage('srpm') {
steps {
package_srpm("rhel", 64, 8, "x86_64", "rocky-8-x86_64", VERSION)
package_srpm("rhel", 64, 9, "x86_64", "rocky+epel-9-x86_64", VERSION)
}
}
stage('rpm') {
steps {
package_rpm("rhel", 64, 8, "x86_64", "rocky-8-x86_64", VERSION)
package_rpm("rhel", 64, 9, "x86_64", "rocky+epel-9-x86_64", VERSION)
}
}
}
}
stage('rhel9 x86_64') {
stage('amzn2 aarch64') {
agent { label 'mock' }
stages {
stage('r64v9') {
stage('a64v2') {
steps {
dir('ws_rhel9-64') {
dir('ws_amzn2-64') {
sh("sudo dnf install -y qemu")
sh("sudo chown couchbase:couchbase -R .")
deleteDir()
unstash 'libcouchbase'
Expand All @@ -482,12 +485,12 @@ pipeline {
}
stage('srpm') {
steps {
package_srpm("rhel", 64, 9, "x86_64", "rocky+epel-9-x86_64", VERSION)
package_srpm("amzn", 64, 2, "aarch64", "amazonlinux-2-aarch64", VERSION)
}
}
stage('rpm') {
steps {
package_rpm("rhel", 64, 9, "x86_64", "rocky+epel-9-x86_64", VERSION)
package_rpm("amzn", 64, 2, "aarch64", "amazonlinux-2-aarch64", VERSION)
}
}
}
Expand All @@ -498,6 +501,7 @@ pipeline {
stage('a64v2') {
steps {
dir('ws_amzn2-64') {
sh("sudo dnf install -y qemu")
sh("sudo chown couchbase:couchbase -R .")
deleteDir()
unstash 'libcouchbase'
Expand All @@ -522,6 +526,7 @@ pipeline {
stage('a64v2023') {
steps {
dir('ws_amzn2023-64') {
sh("sudo dnf install -y qemu")
sh("sudo chown couchbase:couchbase -R .")
deleteDir()
unstash 'libcouchbase'
Expand Down Expand Up @@ -746,37 +751,6 @@ pipeline {
}
}
}
stage('amzn2') {
when {
expression {
return !IS_GERRIT_TRIGGER.toBoolean()
}
}
matrix {
axes {
axis {
name 'PLATFORM'
values 'aarch64'
}
}
agent { label PLATFORM == 'x86_64' ? 'amzn2' : 'qe-grav2-amzn2' }
stages {
stage('rpm') {
steps {
sh('sudo yum erase -y openssl-devel; sudo yum install -y openssl11-devel rpm-build yum-utils; cat /etc/os-release')
unstash('centos7-srpm')
sh('sudo yum-builddep -y libcouchbase-*/*.src.rpm')
sh('sudo rm -rf output; rpmbuild --rebuild libcouchbase-*/*.src.rpm -D "_rpmdir output"')
dir('output') {
sh("mv ${PLATFORM} libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}")
sh("tar cf libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}.tar libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}")
archiveArtifacts(artifacts: "libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}.tar", fingerprint: true)
}
}
}
}
}
}
stage('repositories') {
when {
expression {
Expand Down
57 changes: 1 addition & 56 deletions libcouchbase/lcb-scripted-build-pipeline.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ pipeline {
axes {
axis {
name 'PLATFORM'
values "ubuntu20", "debian9", "centos7", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
values "ubuntu20", "debian9", "rockylinux9", "m1", "qe-grav2-amzn2", "alpine", "qe-ubuntu20-arm64", "qe-ubuntu22-arm64", "qe-rhel9-arm64"
}
}

Expand Down Expand Up @@ -513,30 +513,6 @@ pipeline {
}
}
parallel {
stage('centos7 x86_64') {
agent { label 'mock' }
stages {
stage('c64v7') {
steps {
dir('ws_centos7-64') {
sh("sudo chown couchbase:couchbase -R .")
deleteDir()
unstash 'libcouchbase'
}
}
}
stage('srpm') {
steps {
package_srpm("centos", 64, 7, "x86_64", "epel-7-x86_64", VERSION)
}
}
stage('rpm') {
steps {
package_rpm("centos", 64, 7, "x86_64", "epel-7-x86_64", VERSION)
}
}
}
}
stage('ubuntu1804 amd64') {
agent { label 'cowbuilder' }
stages {
Expand Down Expand Up @@ -641,36 +617,5 @@ pipeline {
}
}
}
stage('amzn2') {
when {
expression {
return !IS_GERRIT_TRIGGER.toBoolean()
}
}
matrix {
axes {
axis {
name 'PLATFORM'
values 'aarch64'
}
}
agent { label PLATFORM == 'x86_64' ? 'amzn2' : 'qe-grav2-amzn2' }
stages {
stage('rpm') {
steps {
sh('sudo yum erase -y openssl-devel; sudo yum install -y openssl11-devel rpm-build yum-utils; cat /etc/os-release')
unstash('centos7-srpm')
sh('sudo yum-builddep -y libcouchbase-*/*.src.rpm')
sh('sudo rm -rf output; rpmbuild --rebuild libcouchbase-*/*.src.rpm -D "_rpmdir output"')
dir('output') {
sh("mv ${PLATFORM} libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}")
sh("tar cf libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}.tar libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}")
archiveArtifacts(artifacts: "libcouchbase-${VERSION.tar()}_amzn2_${PLATFORM}.tar", fingerprint: true)
}
}
}
}
}
}
}
}

0 comments on commit cb3084f

Please sign in to comment.