Skip to content
Permalink
Browse files
BIGTOP-3658. Add Fedora 35 support and drop 33. (#880)
  • Loading branch information
sekikn committed Mar 30, 2022
1 parent dfeb8da commit 30cb157e75be3fdb94b4050eccad0af191c220d7
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 11 deletions.
@@ -0,0 +1,12 @@
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
index ae3b9c6029e..4c32838afb0 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
@@ -27,6 +27,7 @@ set(GTEST_SRC_DIR ${CMAKE_SOURCE_DIR}/../../../../hadoop-common-project/hadoop-c
# Add extra compiler and linker flags.
# -Wno-sign-compare
hadoop_add_compiler_flags("-DNDEBUG -DSIMPLE_MEMCPY -fno-strict-aliasing -fsigned-char")
+set(CMAKE_CXX_STANDARD 11)

# Source location.
set(SRC main/native)
@@ -21,10 +21,10 @@ if [ -f /etc/os-release ]; then
fi

case ${ID}-${VERSION_ID} in
fedora-33)
fedora-35)
dnf -y install yum-utils
dnf -y check-update
dnf -y install hostname diffutils findutils curl sudo unzip wget puppet procps-ng libxcrypt-compat
dnf -y install hostname diffutils findutils curl sudo unzip wget puppet procps-ng libxcrypt-compat systemd
# On Fedora 31, the puppetlabs-stdlib package provided by the distro installs the module
# into /usr/share/puppet/modules, but it's not recognized as the default module path.
# So we install that module in the same way as CentOS 7.
@@ -297,5 +297,16 @@
target => '/usr/bin/cmake3',
}
}

# The rpm-build package had installed brp-python-bytecompile
# just under /usr/lib/rpm until Fedora 34,
# but it seems to have been removed in Fedora 35.
# So we manually create a symlink instead.
if ($operatingsystem == 'Fedora' and versioncmp($operatingsystemmajrelease, '35') >= 0) {
file { '/usr/lib/rpm/brp-python-bytecompile':
ensure => 'link',
target => '/usr/lib/rpm/redhat/brp-python-bytecompile',
}
}
}
}
@@ -230,7 +230,7 @@ task toolchain(type:Exec,
if ('3.7' <= version && version < '4') {
command.addAll(['--parser', 'future'])
}
command.addAll(["--modulepath=${projectDir.absolutePath}:/etc/puppet/modules:/usr/share/puppet/modules:/etc/puppetlabs/code/modules",
command.addAll(["--modulepath=${projectDir.absolutePath}:/etc/puppet/modules:/usr/share/puppet/modules:/etc/puppetlabs/code/modules:/etc/puppet/code/modules",
'-e', 'include bigtop_toolchain::installer'])
workingDir '.'
commandLine command
@@ -268,7 +268,7 @@ Properties:
-Pmemory=[4g|8g|...]
-Pnum_instances=[NUM_INSTANCES]
-Pnexus=[NEXUS_URL] (NEXUS_URL is optional)
-POS=[centos-7|fedora-33|debian-10|ubuntu-18.04|opensuse-42.3]
-POS=[centos-7|fedora-35|debian-10|ubuntu-18.04|opensuse-42.3]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...]
-Prepository=[REPO_URL]
-Prun_smoke_tests (run test components defined in config file)
@@ -563,7 +563,7 @@ task "bigtop-puppet"(type:Exec,
description: '''
Build bigtop/puppet images
Usage:
$ ./gradlew -POS=[centos-7|fedora-33|debian-10|ubuntu-18.04|opensuse-42.3] -Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-puppet
$ ./gradlew -POS=[centos-7|fedora-35|debian-10|ubuntu-18.04|opensuse-42.3] -Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-puppet
Example:
$ ./gradlew -POS=debian-10 -Pprefix=3.0.0 bigtop-puppet
The built image name: bigtop/puppet:3.0.0-debian-10
@@ -582,7 +582,7 @@ task "bigtop-slaves"(type:Exec,
description: '''
Build bigtop/slaves images
Usage:
$ ./gradlew -POS=[centos-7|fedora-33|debian-10|ubuntu-18.04|opensuse-42.3] -Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-slaves
$ ./gradlew -POS=[centos-7|fedora-35|debian-10|ubuntu-18.04|opensuse-42.3] -Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-slaves
Example:
$ ./gradlew -POS=debian-10 -Pprefix=3.0.0 bigtop-slaves
The built image name: bigtop/slaves:3.0.0-debian-10
@@ -56,7 +56,7 @@ case ${OS} in
UPDATE_SOURCE="apt-get clean \&\& apt-get update"
;;
fedora)
PUPPET_MODULES="/etc/puppet/modules/bigtop_toolchain"
PUPPET_MODULES="/etc/puppet/code/modules/bigtop_toolchain"
UPDATE_SOURCE="dnf clean all \&\& dnf updateinfo"
;;
centos)
@@ -508,6 +508,7 @@ def genTasks = { target ->
exec {
workingDir BASE_DIR
executable 'rpmbuild'
environment QA_RPATHS: 0x0002
args command
}
copy {
@@ -645,7 +646,7 @@ def genTasks = { target ->
}
task "$target-pkg-ind" (
description: "Invoking a native binary packaging for $target in Docker. Usage: \$ ./gradlew " +
"-POS=[centos-7|fedora-33|debian-10|ubuntu-18.04] " +
"-POS=[centos-7|fedora-35|debian-10|ubuntu-18.04] " +
"-Pprefix=[trunk|1.4.0|1.3.0|1.2.1|...] $target-pkg-ind " +
"-Pnexus=[true|false]",
group: PACKAGES_GROUP) doLast {
@@ -864,7 +865,7 @@ if (nativePackaging) {

task "repo-ind" (
description: "Invoking a native repository in Docker. Usage: \$ ./gradlew " +
"-POS=[centos-7|fedora-33|debian-10|ubuntu-18.04] " +
"-POS=[centos-7|fedora-35|debian-10|ubuntu-18.04] " +
"-Pprefix=[trunk|1.4.0|1.3.0|1.2.1|...] repo-ind",
group: PACKAGES_GROUP) doLast {
def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
@@ -15,9 +15,9 @@

docker:
memory_limit: "4g"
image: "bigtop/puppet:trunk-fedora-33"
image: "bigtop/puppet:trunk-fedora-35"

repo: "http://repos.bigtop.apache.org/releases/3.0.0/fedora/33/$basearch"
repo: "http://repos.bigtop.apache.org/releases/3.1.0/fedora/35/$basearch"
distro: centos
components: [hdfs, yarn, mapreduce]
enable_local_repo: false

0 comments on commit 30cb157

Please sign in to comment.