Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing version comparison for RPMS, and include new distributions #855

Merged
merged 2 commits into from
Apr 16, 2024
Merged

Fix missing version comparison for RPMS, and include new distributions #855

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2db2e76
Fix RPM build where dist=ALL
steelhead31 Apr 12, 2024
57a462f
Add new distributions for April CPU
steelhead31 Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions linux/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String Versio
jf 'rt u **/build/ospackage/temurin-*${BUILDARCH}.deb deb/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
}
if (BuildArch == "riscv64") {
handleRISCVUpload("Debian")
handleRISCVUpload("Debian")
}
break
case "Alpine":
Expand Down Expand Up @@ -416,7 +416,7 @@ def uploadArtifacts(String DISTRO, String buildArch, String Version) {
uploadAlpineArtifacts(buildArch)
break
default:
uploadRpmArtifacts(DISTRO,buildArch)
uploadRpmArtifacts(DISTRO, buildArch, Version)
break
}
}
Expand Down Expand Up @@ -472,9 +472,11 @@ def uploadDebArtifacts(String buildArch, String Version) {
also update linux/{jdk,jre}/debian/main/packing/build.sh
*/
def deb_versions = [
"trixie", // Debian/13
"bookworm", // Debian/12
"bullseye", // Debian/11
"buster", // Debian/10
"noble", // Ubuntu/24.04 (LTS)
"jammy", // Ubuntu/22.04 (LTS)
"focal", // Ubuntu/20.04 (LTS)
"bionic" // Ubuntu/18.04 (LTS)
Expand Down Expand Up @@ -510,7 +512,8 @@ def uploadDebArtifacts(String buildArch, String Version) {
}
}

def uploadRpmArtifacts(String DISTRO, String rpmArch) {
def uploadRpmArtifacts(String DISTRO, String rpmArch, String Version) {
env.VERSION = Version
def Distro = "RPM"
def distro_Package = [
'redhat' : [
Expand All @@ -524,6 +527,7 @@ def uploadRpmArtifacts(String DISTRO, String rpmArch) {
'rpm/fedora/37',
'rpm/fedora/38',
'rpm/fedora/39',
'rpm/fedora/40',
'rpm/oraclelinux/7',
'rpm/oraclelinux/8',
'rpm/amazonlinux/2'
Expand All @@ -545,17 +549,18 @@ def uploadRpmArtifacts(String DISTRO, String rpmArch) {
's390x' : 's390x',
'riscv64' : 'riscv64'
]

// if VERSION is 8 or 20 remove s390x from the list
if (VERSION == '8' || VERSION == '20') {
rpmArchList.remove('s390x')
}
// if VERSION is 20 remove armv7hl from the list

if (VERSION >= '20') {
rpmArchList.remove('armv7hl')
}

// If Version < 21 remove riscv64
if (VERSION < '21') {
if (VERSION == '8' || VERSION == '11' || VERSION == '17') {
rpmArchList.remove('riscv64')
}

Expand Down