]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
bootstrap: Drop python2 support
authorZack Cerza <zack@redhat.com>
Thu, 31 Mar 2022 19:43:25 +0000 (15:43 -0400)
committerZack Cerza <zack@redhat.com>
Tue, 5 Apr 2022 21:17:36 +0000 (17:17 -0400)
Signed-off-by: Zack Cerza <zack@redhat.com>
bootstrap

index c1dd37c51eb46d2dba34889ff7f67eb2db34fb82..34a5c6104017907989a00c51ca3c54c5a763bf38 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -11,6 +11,11 @@ else
   fi
 fi
 
+if [[ "$PYTHON" =~ "python2" ]]; then
+    echo "python2 is not supported." >&2
+    exit 1
+fi
+
 PYTHON=${PYTHON:-"python3"}
 VENV=${VENV:-"virtualenv"}
 
@@ -18,12 +23,7 @@ case "$(uname -s)" in
 Linux)
     case "$(lsb_release --id --short)" in
     Ubuntu|Debian|LinuxMint)
-        # Ensure setuptools is installed
-        if [[ "$PYTHON" =~ "python2" ]]; then
-            deps=(qemu-utils python-dev libssl-dev python-pip python-virtualenv libev-dev libvirt-dev libffi-dev libyaml-dev)
-        else
-            deps=(qemu-utils python3-dev libssl-dev python3-pip python3-virtualenv libev-dev libvirt-dev libffi-dev libyaml-dev)
-        fi
+        deps=(qemu-utils python3-dev libssl-dev python3-pip python3-virtualenv libev-dev libvirt-dev libffi-dev libyaml-dev)
         for package in ${deps[@]}; do
             if [ "$(dpkg --status -- $package|sed -n 's/^Status: //p')" != "install ok installed" ]; then
                 # add a space after old values
@@ -44,11 +44,7 @@ Linux)
         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
+        deps=(python3-pip python3-devel python3-virtualenv mariadb-devel libev-devel libvirt-devel libffi-devel)
         for package in ${deps[@]}; do
           if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
               missing="${missing:+$missing }$package"
@@ -68,11 +64,7 @@ Linux)
         fi
         ;;
     Fedora)
-        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
+        deps=(python3-pip python3-devel python3-virtualenv libev-devel libvirt-devel libffi-devel)
         for package in ${deps[@]}; do
           if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
               missing="${missing:+$missing }$package"
@@ -97,12 +89,7 @@ Linux)
         fi
         ;;
     "openSUSE project"|"SUSE LINUX"|"openSUSE")
-
-       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
+       deps=(python3-pip python3-devel python3-virtualenv libev-devel libvirt-devel libffi-devel)
        for package in ${deps[@]}; do
             if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
                 if [ "$(rpm -q --whatprovides $package)" == "no package provides $package" ]; then