From 602b5aa9122a650e2c1c3d284ef4f80581c7988b Mon Sep 17 00:00:00 2001 From: George Adams Date: Fri, 31 Dec 2021 15:26:42 +0000 Subject: [PATCH 1/3] RPM add CentOS/RHEL 6 for x64 only --- linuxNew/Jenkinsfile | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/linuxNew/Jenkinsfile b/linuxNew/Jenkinsfile index 168ab6810..8c39471c9 100644 --- a/linuxNew/Jenkinsfile +++ b/linuxNew/Jenkinsfile @@ -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') @@ -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', @@ -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")) { + archesToUse = [ + "x86_64" : "x86_64", + "source" : "src" + ] + } + // Oracle Linux and Amazon Linux support x86_64 and Aarch64 + if (packageDir.contains("oraclelinux") or packageDir.contains("amazonlinux")) { + archesToUse = [ + "x86_64" : "x86_64", + "aarch64": "aarch64", + "source" : "src" + ] + } + archesToUse.each { entry -> rtUpload ( serverId: 'adoptium.jfrog.io', failNoOp: true, From 6721d5a6cee92d70226764dbd8a856a6753dd74c Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 3 Feb 2022 17:12:31 +0000 Subject: [PATCH 2/3] add rocky --- linuxNew/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linuxNew/Jenkinsfile b/linuxNew/Jenkinsfile index 8c39471c9..3cf788dce 100644 --- a/linuxNew/Jenkinsfile +++ b/linuxNew/Jenkinsfile @@ -237,14 +237,14 @@ def uploadRPMArtifacts(distro) { packageDir -> def archesToUse = archs // Centos 6 supported on x86_64 only - if (packageDir.contains("centos/6")) { + 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") or packageDir.contains("amazonlinux")) { + if (packageDir.contains("oraclelinux") || packageDir.contains("amazonlinux") || packageDir.contains("rocky")) { archesToUse = [ "x86_64" : "x86_64", "aarch64": "aarch64", From 3d52faddce076b5e13ac5096c754145885ded99c Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 3 Feb 2022 17:32:52 +0000 Subject: [PATCH 3/3] add centos 6 --- .../src/packageTest/java/packaging/RedHatFlavoursWithYum.java | 1 + 1 file changed, 1 insertion(+) diff --git a/linuxNew/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java b/linuxNew/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java index ee0d2f278..165d63034 100644 --- a/linuxNew/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java +++ b/linuxNew/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java @@ -44,6 +44,7 @@ public Stream provideArguments(ExtensionContext context) { */ return Stream.of( Arguments.of("amazonlinux", "2"), + Arguments.of("centos", "6"), Arguments.of("centos", "7"), Arguments.of("registry.access.redhat.com/ubi7/ubi", "latest"), Arguments.of("oraclelinux", "7")