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.

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

RPM add CentOS/RHEL 6 for x64 only #412

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 24 additions & 4 deletions linuxNew/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ pipeline {
agent {
label NODE_LABEL
}
properties([
buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '1', daysToKeepStr: '', numToKeepStr: '10')),
])
parameters {
string(name: 'PRODUCT', defaultValue: 'temurin')
string(name: 'JDK_SOURCE', defaultValue: 'Adoptium')
Expand Down Expand Up @@ -197,16 +200,17 @@ def uploadRPMArtifacts(distro) {
def tempDistro = distro.toLowerCase()
def distro_Package = [
'redhat' : [
'rpm/centos/6',
'rpm/centos/7',
'rpm/centos/8',
'rpm/rocky/8',
'rpm/rhel/6',
'rpm/rhel/7',
'rpm/rhel/8',
'rpm/fedora/34',
'rpm/fedora/35',
'rpm/oraclelinux/8',
'rpm/amazonlinux/2',
'rpm/oraclelinux/7'
'rpm/oraclelinux/8',
'rpm/amazonlinux/2'
],
'suse' : [
'rpm/opensuse/15.1',
Expand All @@ -231,7 +235,23 @@ def uploadRPMArtifacts(distro) {

packageDirs.each {
packageDir ->
archs.each {
def archesToUse = archs
// Centos 6 supported on x86_64 only
if (packageDir.contains("centos/6") || packageDir.contains("rhel/6")) {
archesToUse = [
"x86_64" : "x86_64",
"source" : "src"
]
}
// Oracle Linux and Amazon Linux support x86_64 and Aarch64
if (packageDir.contains("oraclelinux") || packageDir.contains("amazonlinux") || packageDir.contains("rocky")) {
archesToUse = [
"x86_64" : "x86_64",
"aarch64": "aarch64",
"source" : "src"
]
}
archesToUse.each {
entry -> rtUpload (
serverId: 'adoptium.jfrog.io',
failNoOp: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
*/
return Stream.of(
Arguments.of("amazonlinux", "2"),
Arguments.of("centos", "6"),
gdams marked this conversation as resolved.
Show resolved Hide resolved
Arguments.of("centos", "7"),
Arguments.of("registry.access.redhat.com/ubi7/ubi", "latest"),
Arguments.of("oraclelinux", "7")
Expand Down