[bigtop] branch master updated: BIGTOP-3756: Add Fedora 36 option (#961)

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 3933bc33 BIGTOP-3756: Add Fedora 36 option (#961)
3933bc33 is described below

commit 3933bc33501c9fb9726f0f90a7ac526d4aeef1b8
Author: Leona Yoda <yo...@oss.nttdata.com>
AuthorDate: Fri Sep 9 23:17:39 2022 +0900

    BIGTOP-3756: Add Fedora 36 option (#961)
    
    * Add Fedora 36 support
    - use java 8 during build process because on fedora 36/x86, java 17 is also installed and set as default
    
    * opt-out from default build configuration on fedora 36
    
    * add initscripts installation for fedora 36
---
 bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec |  1 +
 bigtop_toolchain/bin/puppetize.sh                |  2 +-
 docker/bigtop-puppet/build.sh                    | 12 ++++++++++++
 provisioner/docker/config_fedora-36.yaml         | 24 ++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index 1aab808d..0d2f2d39 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -20,6 +20,7 @@
 # since Hadoop build system makes it difficult to pass the kind of flags
 # that would make newer RPM debuginfo generation scripts happy.
 %undefine _missing_build_ids_terminate_build
+%undefine _auto_set_build_flags
 
 %define hadoop_name hadoop
 %define etc_hadoop /etc/%{name}
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index cca661de..5b603b07 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -21,7 +21,7 @@ if [ -f /etc/os-release ]; then
 fi
 
 case ${ID}-${VERSION_ID} in
-    fedora-35)
+    fedora-35|fedora-36)
         dnf -y install yum-utils
         dnf -y check-update
         dnf -y install hostname diffutils findutils curl sudo unzip wget puppet procps-ng libxcrypt-compat systemd
diff --git a/docker/bigtop-puppet/build.sh b/docker/bigtop-puppet/build.sh
index 4cf4b0bd..660ba236 100755
--- a/docker/bigtop-puppet/build.sh
+++ b/docker/bigtop-puppet/build.sh
@@ -51,5 +51,17 @@ ${ENV_PATH}
 RUN bash /tmp/puppetize.sh
 EOF
 
+# modify the Dockerfile according to the OS/version
+case "${OS}-${VERSION}" in
+  fedora-36*)
+    # use java 8 during build if the os's default java version is newer
+    sed -i -e "s|RUN bash /tmp/puppetize.sh|ENV PATH /usr/lib/jvm/java-1.8.0/bin:\$PATH\nRUN bash /tmp/puppetize.sh|" Dockerfile
+    # add initd
+    sed -i -e "s|RUN bash /tmp/puppetize.sh|RUN bash /tmp/puppetize.sh\nRUN dnf install -y initscripts|" Dockerfile
+    ;;
+  *)
+    ;;
+esac
+
 docker build -t bigtop/puppet:${PREFIX}-${OS}-${VERSION}${ARCH} .
 rm -f Dockerfile puppetize.sh
diff --git a/provisioner/docker/config_fedora-36.yaml b/provisioner/docker/config_fedora-36.yaml
new file mode 100644
index 00000000..d0d778ac
--- /dev/null
+++ b/provisioner/docker/config_fedora-36.yaml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+docker:
+        memory_limit: "4g"
+        image: "bigtop/puppet:trunk-fedora-36"
+
+repo: "http://repos.bigtop.apache.org/releases/3.1.0/fedora/36/$basearch"
+distro: centos
+components: [hdfs, yarn, mapreduce]
+enable_local_repo: false
+smoke_test_components: [hdfs, yarn, mapreduce]