[bigtop] branch master updated: BIGTOP-3522. Drop Fedora 31 and add Fedora 33 support. (#752)

[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 29ed086  BIGTOP-3522. Drop Fedora 31 and add Fedora 33 support. (#752)
29ed086 is described below

commit 29ed0861380256f74d958363499771384913848b
Author: Kengo Seki <se...@apache.org>
AuthorDate: Wed Mar 10 08:35:46 2021 +0900

    BIGTOP-3522. Drop Fedora 31 and add Fedora 33 support. (#752)
---
 bigtop_toolchain/bin/puppetize.sh                                   | 2 +-
 bigtop_toolchain/manifests/packages.pp                              | 1 -
 provisioner/docker/{config_fedora-31.yaml => config_fedora-33.yaml} | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index 358dadc..0259d6b 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-31)
+    fedora-33)
         dnf -y install yum-utils
         dnf -y check-update
         dnf -y install hostname diffutils findutils curl sudo unzip wget puppet procps-ng libxcrypt-compat
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index dd896dd..29aaa4e 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -34,7 +34,6 @@ class bigtop_toolchain::packages {
         "fuse-devel",
         "cppunit-devel",
         "openssl-devel",
-        "python2-pip",
         "libxml2-devel",
         "libxslt-devel",
         "cyrus-sasl-devel",
diff --git a/provisioner/docker/config_fedora-31.yaml b/provisioner/docker/config_fedora-33.yaml
similarity index 89%
rename from provisioner/docker/config_fedora-31.yaml
rename to provisioner/docker/config_fedora-33.yaml
index 0a830ad..aea77a0 100644
--- a/provisioner/docker/config_fedora-31.yaml
+++ b/provisioner/docker/config_fedora-33.yaml
@@ -15,9 +15,9 @@
 
 docker:
         memory_limit: "4g"
-        image: "bigtop/puppet:trunk-fedora-31"
+        image: "bigtop/puppet:trunk-fedora-33"
 
-repo: "http://repos.bigtop.apache.org/releases/1.5.0/fedora/31/$basearch"
+repo: "http://repos.bigtop.apache.org/releases/3.0.0/fedora/33/$basearch"
 distro: centos
 components: [hdfs, yarn, mapreduce]
 enable_local_repo: false