This is an automated email from the ASF dual-hosted git repository.
iwasakims 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 77df8f67c BIGTOP-4093. Avoid oepkgs for installing R on openEuler.
(#1258)
77df8f67c is described below
commit 77df8f67c2b419f2651b842967b7cb026d016a58
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Thu Apr 18 23:24:16 2024 +0900
BIGTOP-4093. Avoid oepkgs for installing R on openEuler. (#1258)
---
bigtop_toolchain/bin/puppetize.sh | 5 -----
bigtop_toolchain/manifests/renv.pp | 25 ++++++----------------
build.gradle | 6 +++---
...03-lts-sp1.yaml => config_openeuler-22.03.yaml} | 2 +-
4 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/bigtop_toolchain/bin/puppetize.sh
b/bigtop_toolchain/bin/puppetize.sh
index d4c2a531b..27bd82ddb 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -82,11 +82,6 @@ case ${ID}-${VERSION_ID} in
;;
openEuler-*)
dnf -y install hostname curl sudo unzip wget ruby ruby-devel vim
systemd-devel findutils 'dnf-command(config-manager)' nc initscripts
openeuler-lsb openssl-devel make gcc-c++ openEuler-rpm-config python3-pip
python3-devel dbus
- dnf config-manager --add-repo
https://repo.oepkgs.net/openeuler/rpm/openEuler-22.03-LTS/extras/$HOSTTYPE
- echo "gpgcheck=0" >>
/etc/yum.repos.d/repo.oepkgs.net_openeuler_rpm_openEuler-22.03-LTS_extras_$HOSTTYPE.repo
- sed -i "s|enabled=1|enabled=1 \npriority=10|g"
/etc/yum.repos.d/openEuler.repo
- dnf clean all
- dnf makecache
# openEuler ruby version is 3.X,so use puppet-7.22.0.
gem install puppet:7.22.0 xmlrpc sync sys-filesystem
puppet module install puppetlabs-stdlib --version 4.12.0
diff --git a/bigtop_toolchain/manifests/renv.pp
b/bigtop_toolchain/manifests/renv.pp
index 1f43d7275..e5d01547c 100644
--- a/bigtop_toolchain/manifests/renv.pp
+++ b/bigtop_toolchain/manifests/renv.pp
@@ -49,50 +49,39 @@ class bigtop_toolchain::renv {
]
}
}
- /openEuler/: {
- $pkgs = [
- "R",
- "R-devel",
- ]
- }
}
#BIGTOP-3967: openEuler not support PowerPC currently.
if ($operatingsystem == 'openEuler'){
if ($architecture == "aarch64") {
- $url =
"https://github.com/jgm/pandoc/releases/download/2.19.2/pandoc-2.19.2-linux-arm64.tar.gz";
+ $pandocurl =
"https://github.com/jgm/pandoc/releases/download/2.19.2/pandoc-2.19.2-linux-arm64.tar.gz";
$pandoctar = "pandoc-2.19.2-linux-arm64.tar.gz"
} else{
- $url =
"https://github.com/jgm/pandoc/releases/download/2.19.2/pandoc-2.19.2-linux-amd64.tar.gz";
+ $pandocurl =
"https://github.com/jgm/pandoc/releases/download/2.19.2/pandoc-2.19.2-linux-amd64.tar.gz";
$pandoctar = "pandoc-2.19.2-linux-amd64.tar.gz"
}
exec {"down_pandoc":
cwd => "/usr/src",
- command => "/usr/bin/wget $url && /bin/tar -xvzf $pandoctar && ln -s
/usr/src/pandoc-2.19.2/bin/pandoc /usr/bin/pandoc",
+ command => "/usr/bin/wget $pandocurl && /bin/tar -xvzf $pandoctar && ln
-s /usr/src/pandoc-2.19.2/bin/pandoc /usr/bin/pandoc",
}
}
- package { $pkgs:
- ensure => installed,
- before => [Exec["install_r_packages"]]
- }
-
-
# BIGTOP-3483:
# Upgrade R version to 3.6.3 to build Spark 3.0.1 on Ubuntu 16.04 and 18.04
#
# Then Install required R packages dependency
if (($operatingsystem == 'Ubuntu' and versioncmp($operatingsystemmajrelease,
'18.04') <= 0) or
- ($operatingsystem == 'Debian' and versioncmp($operatingsystemmajrelease,
'10') <= 0)) {
- $url = "https://cran.r-project.org/src/base/R-3/";
+ ($operatingsystem == 'Debian' and versioncmp($operatingsystemmajrelease,
'10') <= 0) or
+ ($operatingsystem == 'openEuler')) {
+ $rurl = "https://cran.r-project.org/src/base/R-3/";
$rfile = "R-3.6.3.tar.gz"
$rdir = "R-3.6.3"
exec { "download_R":
cwd => "/usr/src",
- command => "/usr/bin/wget $url/$rfile && mkdir -p $rdir && /bin/tar
-xvzf $rfile -C $rdir --strip-components=1 && cd $rdir",
+ command => "/usr/bin/wget $rurl/$rfile && mkdir -p $rdir && /bin/tar
-xvzf $rfile -C $rdir --strip-components=1 && cd $rdir",
creates => "/usr/src/$rdir",
}
exec { "install_R":
diff --git a/build.gradle b/build.gradle
index 42b07f897..31f45173a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -267,7 +267,7 @@ Properties:
-Pmemory=[4g|8g|...]
-Pnum_instances=[NUM_INSTANCES]
-Pnexus=[NEXUS_URL] (NEXUS_URL is optional)
- -POS=[centos-7|fedora-35|ubuntu-18.04|opensuse-42.3|openeuler-22.03-lts-sp1]
+ -POS=[centos-7|fedora-35|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...]
-Prepository=[REPO_URL]
-Prun_smoke_tests (run test components defined in config file)
@@ -562,7 +562,7 @@ task "bigtop-puppet"(type:Exec,
description: '''
Build bigtop/puppet images
Usage:
- $ ./gradlew
-POS=[centos-7|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03-lts-sp1]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-puppet
+ $ ./gradlew
-POS=[centos-7|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-puppet
Example:
$ ./gradlew -POS=debian-11 -Pprefix=3.0.0 bigtop-puppet
The built image name: bigtop/puppet:3.0.0-debian-11
@@ -581,7 +581,7 @@ task "bigtop-slaves"(type:Exec,
description: '''
Build bigtop/slaves images
Usage:
- $ ./gradlew
-POS=[centos-7|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03-lts-sp1]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-slaves
+ $ ./gradlew
-POS=[centos-7|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-slaves
Example:
$ ./gradlew -POS=debian-11 -Pprefix=3.0.0 bigtop-slaves
The built image name: bigtop/slaves:3.0.0-debian-11
diff --git a/provisioner/docker/config_openeuler-22.03-lts-sp1.yaml
b/provisioner/docker/config_openeuler-22.03.yaml
similarity index 94%
rename from provisioner/docker/config_openeuler-22.03-lts-sp1.yaml
rename to provisioner/docker/config_openeuler-22.03.yaml
index e66d1e11d..a8fbe6ed5 100644
--- a/provisioner/docker/config_openeuler-22.03-lts-sp1.yaml
+++ b/provisioner/docker/config_openeuler-22.03.yaml
@@ -15,7 +15,7 @@
docker:
memory_limit: "4g"
- image: "bigtop/puppet:trunk-openeuler-22.03-lts-sp1"
+ image: "bigtop/puppet:trunk-openeuler-22.03"
repo:
"http://repios.bigtop.apache.org/releases/3.2.0/openEuler/22.03/$basearch";
distro: centos
