updated centos7 version, fixed awscli problem

rafie · rafie · commit 8ae67685eff5 · 2020-07-15T12:43:20.000+03:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .NOTPARALLEL:
 
-# OSNICK=buster|stretch|xenial|bionic|centos6|centos7|centos8|fedora30
+# OSNICK=buster|stretch|trusty|xenial|bionic|centos6|centos7|centos8|fedora30
 OSNICK ?= buster
 
 # OS ?= debian:buster-slim
@@ -19,10 +19,10 @@ OS.focal=ubuntu:focal
 OS.stretch=debian:stretch-slim
 OS.buster=debian:buster-slim
 OS.centos6=centos:6.10
-OS.centos7=centos:7.6.1810
+OS.centos7=centos:7.8.2003
 OS.centos8=centos:8
-OS.fedora=fedora:30
-OS.fedora30=fedora:30
+OS.fedora=fedora:33
+OS.fedora33=fedora:33
 OS:=$(OS.$(OSNICK))
 
 ifeq ($(OS),)
diff --git a/modules/ai/system-setup.py b/modules/ai/system-setup.py
@@ -19,12 +19,12 @@ def __init__(self, nop=False):
     def common_first(self):
         self.install_downloaders()
         self.setup_pip()
-        self.pip3_install("wheel virtualenv")
-        self.pip3_install("setuptools --upgrade")
+        self.pip_install("wheel virtualenv")
+        self.pip_install("setuptools --upgrade")
 
         if self.os == 'linux':
             self.install("ca-certificates")
-        self.install("git cmake unzip wget patchelf awscli")
+        self.install("git cmake unzip wget patchelf")
         self.install("coreutils") # for realpath
 
     def debian_compat(self):
@@ -43,7 +43,7 @@ def redhat_compat(self):
         else:
             self.run("amazon-linux-extras install epel", output_on_error=True)
             self.install("python3 python3-devel")
-            self.pip3_install("psutil")
+            self.pip_install("psutil")
 
         self.install_git_lfs_on_linux()
 
@@ -64,15 +64,16 @@ def macosx(self):
 
     def common_last(self):
         # redis-py-cluster should be installed from git due to redis-py dependency
-        self.pip3_install("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master")
+        self.pip_install("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master")
         # the following can be probably installed from pypi
-        self.pip3_install("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master")
-        self.pip3_install("--no-cache-dir git+https://github.com/RedisLabs/RAMP@master")
+        self.pip_install("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master")
+        self.pip_install("--no-cache-dir git+https://github.com/RedisLabs/RAMP@master")
 
         root = os.path.join(os.path.dirname(__file__), "..")
-        # self.pip3_install("-r {}/test/test_requirements.txt".format(root))
+        # self.pip_install("-r {}/test/test_requirements.txt".format(root))
 
-        self.pip3_install("mkdocs mkdocs-material mkdocs-extensions")
+        self.pip_install("awscli")
+        self.pip_install("mkdocs mkdocs-material mkdocs-extensions")
 
 #----------------------------------------------------------------------------------------------
 
diff --git a/modules/search/system-setup.py b/modules/search/system-setup.py
@@ -19,7 +19,7 @@ def common_first(self):
         self.pip_install("wheel")
         self.pip_install("setuptools --upgrade")
 
-        self.install("git cmake wget awscli lcov")
+        self.install("git cmake wget lcov")
 
     def debian_compat(self):
         self.install("libatomic1")
@@ -31,10 +31,6 @@ def redhat_compat(self):
         self.group_install("'Development Tools'")
         self.install("redhat-lsb-core")
 
-        # uninstall and install psutil (order is important), otherwise RLTest fails
-        # self.run("pip uninstall -y psutil || true")
-        self.install("python2-psutil")
-
     def fedora(self):
         self.install("libatomic")
         self.group_install("'Development Tools'")
@@ -50,7 +46,7 @@ def common_last(self):
         if not self.has_command("RLTest"):
             self.pip_install("git+https://github.com/RedisLabsModules/RLTest.git@master")
         self.pip_install("redis-py-cluster")
-        self.pip_install("pudb")
+        self.pip_install("pudb awscli")
 
 #----------------------------------------------------------------------------------------------
 
diff --git a/system-setup.py b/system-setup.py
@@ -27,10 +27,6 @@ def common_first(self):
     def debian_compat(self):
         self.install("build-essential")
         if self.osnick == 'trusty':
-            # # install python3.6
-            # self.add_repo("ppa:deadsnakes/ppa")
-            # self.install("python3.6")
-            # self.run("ln -sf `which python3.6` /usr/local/bin/python3")
             # install gcc-7
             self.add_repo("ppa:ubuntu-toolchain-r/test")
             self.install("gcc-7 g++-7")
