This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 57232107ef AMBARI-26133: Add RockyLinux-9 support (#3827)
57232107ef is described below
commit 57232107ef2bbb18e37b715e8ce0342ca2a0c5fe
Author: timyuer <ho...@apache.org>
AuthorDate: Fri Sep 13 09:07:59 2024 +0800
AMBARI-26133: Add RockyLinux-9 support (#3827)
* AMBARI-26133: Add RockyLinux-9 support
---
.../src/main/python/ambari_commons/os_check.py | 4 ++--
.../python/ambari_commons/resources/os_family.json | 28 +++++++++++++++-------
.../AMBARI_INFRA_SOLR/3.0.0/metainfo.xml | 2 +-
.../AMBARI_METRICS/3.0.0/metainfo.xml | 4 ++--
.../stacks/BIGTOP/3.2.0/repos/repoinfo.xml | 7 ++++++
.../BIGTOP/3.2.0/services/FLINK/metainfo.xml | 2 +-
.../BIGTOP/3.2.0/services/HBASE/metainfo.xml | 2 +-
.../stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml | 2 +-
.../stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml | 2 +-
.../BIGTOP/3.2.0/services/KAFKA/metainfo.xml | 2 +-
.../BIGTOP/3.2.0/services/KERBEROS/metainfo.xml | 2 +-
.../stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml | 2 +-
.../stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml | 2 +-
.../BIGTOP/3.2.0/services/SPARK/metainfo.xml | 2 +-
.../stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml | 2 +-
.../services/YARN/configuration/yarn-site.xml | 1 +
.../stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml | 4 ++--
.../BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml | 2 +-
.../BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml | 2 +-
.../stacks/BIGTOP/3.3.0/repos/repoinfo.xml | 7 ++++++
.../BIGTOP/3.3.0/services/RANGER/metainfo.xml | 2 +-
.../BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml | 2 +-
.../src/main/resources/version_definition.xsd | 15 ++++++------
23 files changed, 62 insertions(+), 38 deletions(-)
diff --git a/ambari-common/src/main/python/ambari_commons/os_check.py
b/ambari-common/src/main/python/ambari_commons/os_check.py
index 2770f37cc2..59e11fb27c 100644
--- a/ambari-common/src/main/python/ambari_commons/os_check.py
+++ b/ambari-common/src/main/python/ambari_commons/os_check.py
@@ -194,7 +194,7 @@ class OSCheck:
distribution = ("", "", "")
else:
# linux distribution
- distribution = distro.linux_distribution()
+ distribution = distro.linux_distribution(full_distribution_name=False)
if distribution[0] == '':
distribution = advanced_check(distribution)
@@ -226,7 +226,7 @@ class OSCheck:
def get_os_type():
"""
Return values:
- redhat, fedora, centos, oraclelinux, ascendos,
+ redhat, fedora, centos, oracle, ascendos,
amazon, xenserver, oel, ovs, cloudlinux, slc, scientific, psbm,
ubuntu, debian, sles, sled, opensuse, suse ... and others
diff --git
a/ambari-common/src/main/python/ambari_commons/resources/os_family.json
b/ambari-common/src/main/python/ambari_commons/resources/os_family.json
index 6c83ca570c..616e29e0bf 100644
--- a/ambari-common/src/main/python/ambari_commons/resources/os_family.json
+++ b/ambari-common/src/main/python/ambari_commons/resources/os_family.json
@@ -3,7 +3,7 @@
"redhat": {
"distro": [
"redhat",
- "fedora",
+ "rhel",
"centos",
"oraclelinux",
"ascendos",
@@ -14,12 +14,14 @@
"slc",
"scientific",
"psbm",
- "centos linux"
+ "centos linux",
+ "rocky"
],
"versions": [
6,
7,
- 8
+ 8,
+ 9
]
},
"redhat-ppc": {
@@ -42,6 +44,16 @@
22
]
},
+ "fedora": {
+ "extends" : "redhat",
+ "distro": [
+ "fedora"
+ ],
+ "versions": [
+ 36,
+ 38
+ ]
+ },
"amazonlinux": {
"extends" : "redhat",
"distro": [
@@ -57,8 +69,8 @@
"debian"
],
"versions": [
- 7,
- 9
+ 10,
+ 11
]
},
"ubuntu": {
@@ -66,10 +78,8 @@
"ubuntu"
],
"versions": [
- 12,
- 14,
- 16,
- 18
+ 20,
+ 22
]
},
"suse": {
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/3.0.0/metainfo.xml
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/3.0.0/metainfo.xml
index d615712707..bb6971e2d7 100755
---
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/3.0.0/metainfo.xml
+++
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/3.0.0/metainfo.xml
@@ -146,7 +146,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>ambari-infra-solr-client</name>
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml
index 06a8e0716d..18995f307d 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml
@@ -143,7 +143,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>ambari-metrics-collector</name>
@@ -169,7 +169,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat7,redhat6,amazonlinux2</osFamily>
+ <osFamily>redhat7,amazonlinux2</osFamily>
<packages>
<package>
<name>python-kerberos</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/repos/repoinfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/repos/repoinfo.xml
index f2a127beff..44e8740e97 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/repos/repoinfo.xml
@@ -30,6 +30,13 @@
<reponame>bigtop</reponame>
</repo>
</os>
+ <os family="redhat9">
+ <repo>
+
<baseurl>https://bigtop-snapshot.s3.amazonaws.com/centos-9/$basearch</baseurl>
+ <repoid>BIGTOP-3.2.0</repoid>
+ <reponame>bigtop</reponame>
+ </repo>
+ </os>
<os family="openeuler22">
<repo>
<baseurl>https://bigtop-snapshot.s3.amazonaws.com/openeuler-22/$basearch</baseurl>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/FLINK/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/FLINK/metainfo.xml
index 88536c613e..e650f0c486 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/FLINK/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/FLINK/metainfo.xml
@@ -105,7 +105,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>flink_${stack_version}</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metainfo.xml
index a74df17bf0..657459107b 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metainfo.xml
@@ -167,7 +167,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>hbase_${stack_version}</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml
index 172a0f031b..e6ca441acc 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml
@@ -330,7 +330,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml
index 7d1aaef17e..66b08a897a 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml
@@ -281,7 +281,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>hive_${stack_version}</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KAFKA/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KAFKA/metainfo.xml
index d3031c7856..88539374c0 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KAFKA/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KAFKA/metainfo.xml
@@ -94,7 +94,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>kafka_${stack_version}</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KERBEROS/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KERBEROS/metainfo.xml
index 9a3c015a26..42e4db03c0 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KERBEROS/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KERBEROS/metainfo.xml
@@ -81,7 +81,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>krb5-workstation</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml
index ff8359afd6..1dff9f94dd 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml
@@ -97,7 +97,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>spark_${stack_version}-core</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml
index 4ea46644c9..ca5de38476 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml
@@ -64,7 +64,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>solr_${stack_version}</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SPARK/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SPARK/metainfo.xml
index d5ca3f0c6a..659d78838b 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SPARK/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SPARK/metainfo.xml
@@ -204,7 +204,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>spark_${stack_version}-core</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml
index 764e2ce3b1..fbe7ca369d 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml
@@ -75,7 +75,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>tez_${stack_version}</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/configuration/yarn-site.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/configuration/yarn-site.xml
index b1017fcaff..876a0dd0bc 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/configuration/yarn-site.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/configuration/yarn-site.xml
@@ -498,6 +498,7 @@
</value-attributes>
<on-ambari-upgrade add="true"/>
</property>
+ <property>
<name>yarn.timeline-service.ttl-ms</name>
<description>Time to live for timeline store data in
milliseconds.</description>
<value>2678400000</value>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml
index a3ab15cd72..7c31421e04 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml
@@ -226,7 +226,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}-yarn</name>
@@ -379,7 +379,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}-mapreduce</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml
index 81e6b7def2..79739c306e 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml
@@ -65,7 +65,7 @@ limitations under the License.
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>zeppelin_${stack_version}</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml
index aff74b2e68..7e88dc8725 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml
@@ -72,7 +72,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>zookeeper_${stack_version}</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/repos/repoinfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/repos/repoinfo.xml
index db01d3c142..95355374af 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/repos/repoinfo.xml
@@ -30,6 +30,13 @@
<reponame>bigtop</reponame>
</repo>
</os>
+ <os family="redhat9">
+ <repo>
+
<baseurl>https://bigtop-snapshot.s3.amazonaws.com/centos-9/$basearch</baseurl>
+ <repoid>BIGTOP-3.3.0</repoid>
+ <reponame>bigtop</reponame>
+ </repo>
+ </os>
<os family="openeuler22">
<repo>
<baseurl>https://bigtop-snapshot.s3.amazonaws.com/openeuler-22/$basearch</baseurl>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/metainfo.xml
index 2743a244e6..0be415c95b 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/metainfo.xml
@@ -144,7 +144,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8,openeuler22</osFamily>
+ <osFamily>redhat7,redhat8,redhat9,openeuler22</osFamily>
<packages>
<package>
<name>ranger_${stack_version}-admin</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml
index 492723ab9e..7d65d7f7a8 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml
@@ -60,7 +60,7 @@
<osSpecifics>
<osSpecific>
-
<osFamily>redhat9,redhat8,redhat7,amazonlinux2,redhat6,suse11,suse12,openeuler22</osFamily>
+
<osFamily>redhat7,redhat8,redhat9,amazonlinux2,suse11,suse12,openeuler22</osFamily>
<packages>
<package>
<name>ranger_${stack_version}-kms</name>
diff --git a/ambari-server/src/main/resources/version_definition.xsd
b/ambari-server/src/main/resources/version_definition.xsd
index 50261d99d3..c567765b6b 100644
--- a/ambari-server/src/main/resources/version_definition.xsd
+++ b/ambari-server/src/main/resources/version_definition.xsd
@@ -51,18 +51,17 @@
<xs:simpleType name="family-type">
<xs:restriction base="xs:string">
- <xs:enumeration value="redhat6" />
<xs:enumeration value="redhat7" />
<xs:enumeration value="redhat8" />
+ <xs:enumeration value="redhat9" />
+ <xs:enumeration value="fedora36" />
+ <xs:enumeration value="fedora38" />
<xs:enumeration value="redhat-ppc6" />
<xs:enumeration value="redhat-ppc7" />
- <xs:enumeration value="debian6" />
- <xs:enumeration value="debian7" />
- <xs:enumeration value="debian9" />
- <xs:enumeration value="ubuntu12" />
- <xs:enumeration value="ubuntu14" />
- <xs:enumeration value="ubuntu16" />
- <xs:enumeration value="ubuntu18" />
+ <xs:enumeration value="debian10" />
+ <xs:enumeration value="debian11" />
+ <xs:enumeration value="ubuntu20" />
+ <xs:enumeration value="ubuntu22" />
<xs:enumeration value="suse11" />
<xs:enumeration value="suse12" />
<xs:enumeration value="amazonlinux2" />
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
