[bigtop] branch branch-3.0 updated: BIGTOP-3652. Add the python-is-python2 package to the toolchain for Ubuntu 20.04. (#872)

[se...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new addee6b  BIGTOP-3652. Add the python-is-python2 package to the toolchain for Ubuntu 20.04. (#872)
addee6b is described below

commit addee6bd7e168743f8c8834d2f67c1ac9229e360
Author: Kengo Seki <se...@apache.org>
AuthorDate: Fri Mar 11 18:38:55 2022 +0900

    BIGTOP-3652. Add the python-is-python2 package to the toolchain for Ubuntu 20.04. (#872)
    
    (cherry picked from commit cfd45fa17c85ba74a4a26c224491bf4127603f78)
---
 bigtop_toolchain/manifests/packages.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 2f1e579..7823c93 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -152,7 +152,7 @@ class bigtop_toolchain::packages {
       "libffi-devel"
     ] }
     /(Ubuntu|Debian)/: {
-      $pkgs = [
+      $_pkgs = [
         "unzip",
         "curl",
         "wget",
@@ -211,6 +211,13 @@ class bigtop_toolchain::packages {
         "python3-dev",
         "python2.7-dev"
       ]
+
+      if ($operatingsystem == 'Ubuntu' and 0 <= versioncmp($operatingsystemmajrelease, '20.04')) {
+        $pkgs = concat($_pkgs, ["python-is-python2"])
+      } else {
+        $pkgs = $_pkgs
+      }
+
       file { '/etc/apt/apt.conf.d/01retries':
         content => 'Aquire::Retries "5";'
       } -> Package <| |>