]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
python3 packages for fedora and redhat based systems 1505/head
authorrakeshgm <rakeshgm@redhat.com>
Mon, 8 Jun 2020 11:48:42 +0000 (17:18 +0530)
committerrakeshgm <rakeshgm@redhat.com>
Tue, 9 Jun 2020 03:58:54 +0000 (09:28 +0530)
Signed-off-by: rakeshgm <rakeshgm@redhat.com>
bootstrap

index b12eda5b7fc79179f744ebcb047368debbbe3104..eb7cd1c1bf10b53f1c45ff7c7a5c14a981b90336 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -44,13 +44,18 @@ Linux)
             fi
         fi
         ;;
-    RedHatEnterpriseWorkstation|RedHatEnterpriseServer|CentOS)
-        for package in python2-pip python-virtualenv mariadb-devel libev-devel libvirt-devel libffi-devel; do
-           if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
-               missing="${missing:+$missing }$package"
-           fi
+    RedHatEnterpriseWorkstation|RedHatEnterpriseServer|RedHatEnterprise|CentOS)
+        if [[ "$PYTHON" =~ "python2" ]]; then
+            deps=(python-pip python-devel python-virtualenv mariadb-devel libev-devel libvirt-devel libffi-devel)
+        else
+            deps=(python3-pip python3-devel python3-virtualenv mariadb-devel libev-devel libvirt-devel libffi-devel)
+        fi
+        for package in ${deps[@]}; do
+          if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
+              missing="${missing:+$missing }$package"
+          fi
         done
-       if [ -n "$missing" ]; then
+        if [ -n "$missing" ]; then
             echo "$0: missing required packages:" 1>&2
             echo "$missing"
             if [ "$install" = true ]; then
@@ -61,20 +66,25 @@ Linux)
                 echo "sudo yum -y install $missing"
                 exit 1
             fi
-       fi
-       ;;
+        fi
+        ;;
     Fedora)
-        for package in python2-pip python2-virtualenv libev-devel libvirt-devel libffi-devel; do
-           if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
-               missing="${missing:+$missing }$package"
-           fi
-       done
-       fedora_release=$(lsb_release -rs)
-       package_manager=dnf
-       if [ $fedora_release -lt 23 ]; then
-           package_manager=yum
-       fi
-       if [ -n "$missing" ]; then
+        if [[ "$PYTHON" =~ "python2" ]]; then
+            deps=(python-pip python-devel python-virtualenv libev-devel libvirt-devel libffi-devel)
+        else
+            deps=(python3-pip python3-devel python3-virtualenv libev-devel libvirt-devel libffi-devel)
+        fi
+        for package in ${deps[@]}; do
+          if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
+              missing="${missing:+$missing }$package"
+          fi
+        done
+        fedora_release=$(lsb_release -rs)
+        package_manager=dnf
+        if [ $fedora_release -lt 23 ]; then
+            package_manager=yum
+        fi
+        if [ -n "$missing" ]; then
             echo "$0: missing required packages:" 1>&2
             echo "$missing"
             if [ "$install" = true ]; then
@@ -85,8 +95,8 @@ Linux)
                 echo "sudo $package_manager -y install $missing"
                 exit 1
             fi
-       fi
-       ;;
+        fi
+        ;;
     "openSUSE project"|"SUSE LINUX"|"openSUSE")
 
        if [[ "$PYTHON" =~ "python2" ]]; then