Fixes for 3.5 testing

release_tester/arangodb/installers/base.py

@@ -77,10 +77,11 @@ def __repr__(self):
 
     def check_installed(self, version, enterprise, check_stripped, check_symlink):
         """ check all attributes of this file in reality """
-        #TODO consider only certain versions
-        #use semver package
-
-        self.check_path(enterprise)
+        if semver.compare(self.version_min, version) == 1:
+            self.check_path(enterprise, False)
+            return
+        else:
+            self.check_path(enterprise)
 
         if not enterprise and self.enterprise:
             #checks do not need to continue in this case
@@ -91,10 +92,10 @@ def check_installed(self, version, enterprise, check_stripped, check_symlink):
             self.check_symlink()
 
 
-    def check_path(self, enterprise):
+    def check_path(self, enterprise, in_version = True):
         """ check whether the file rightfully exists or not """
         if enterprise and self.enterprise:
-            if not self.path.is_file():
+            if not self.path.is_file() and in_version:
                 raise Exception("Binary missing from enterprise package!" + str(self.path))
 
         #file must not exist
@@ -224,7 +225,7 @@ def get_arangod_conf(self):
 
     def supports_hot_backup(self):
         """ by default hot backup is supported by the targets, there may be execptions."""
-        return True
+        return semver.compare(self.cfg.version, "3.5.1") >=0
 
     def calc_config_file_name(self):
         """ store our config to disk - so we can be invoked partly """
@@ -354,7 +355,7 @@ def caclulate_file_locations(self):
         # enterprise
         self.arango_binaries.append(BinaryDescription(
             self.cfg.real_bin_dir, 'arangobackup',
-            True, True, "1.0.0", "4.0.0", [], 'c++'))
+            True, True, "3.5.1", "4.0.0", [], 'c++'))
 
         self.arango_binaries.append(BinaryDescription(
             self.cfg.real_sbin_dir, 'arangosync',
@@ -364,7 +365,7 @@ def caclulate_file_locations(self):
 
         self.arango_binaries.append(BinaryDescription(
             self.cfg.real_sbin_dir, 'rclone-arangodb',
-            True, True, "1.0.0", "4.0.0", [], 'go'))
+            True, True, "3.5.1", "4.0.0", [], 'go'))
 
     def check_installed_files(self):
         """ check for the files whether they're installed """

release_tester/arangodb/installers/tar.py

@@ -101,7 +101,7 @@ def install_package(self):
         logging.debug("package dir: {0.cfg.package_dir}- server_package: {0.server_package}".format(self))
 
         cmd = [self.tar,
-                   '-xzf',
+                   '-xf',
                    str(self.cfg.package_dir / self.server_package),
                    '-C',
                    '/tmp/']

release_tester/arangodb/starter/deployments/runner.py

@@ -14,6 +14,7 @@
 import requests
 import time
 import platform
+import semver
 
 from arangodb.installers.base import InstallerBase
 from arangodb.installers import InstallerConfig
@@ -402,7 +403,7 @@ def check_data_impl(self):
         raise Exception("no frontend found.")
 
     def supports_backup_impl(self):
-        return True
+        return semver.compare(self.cfg.version, "3.5.1") >= 0
 
     def create_non_backup_data(self):
         for starter in self.makedata_instances:

release_tester/arangodb/starter/manager.py

@@ -16,6 +16,7 @@
 # from typing import List, Dict, NamedTuple
 
 import psutil
+import semver
 
 import http.client as http_client
 from tools.asciiprint import ascii_print, print_progress as progress
@@ -57,7 +58,7 @@ def __init__(self,
             self.moreopts += ["--starter.port", "%d" % self.starter_port]
 
         self.hotbackup = []
-        if self.cfg.enterprise:
+        if self.cfg.enterprise and semver.compare(self.cfg.version, "3.5.1") >=0:
             self.hotbackup = ['--all.rclone.executable', self.cfg.real_sbin_dir / 'rclone-arangodb']
 
         # arg - jwtstr
@@ -328,7 +329,7 @@ def replace_binary_for_upgrade(self, new_install_cfg):
         """
         # On windows the install prefix may change, since we can't overwrite open files:
         self.cfg.set_directories(new_install_cfg)
-        if self.cfg.enterprise:
+        if self.cfg.enterprise and semver.compare(self.cfg.version, "3.5.1") >= 0:
             self.hotbackup = ['--all.rclone.executable', self.cfg.sbin_dir / 'rclone-arangodb']
         logging.info("StarterManager: Killing my instance [%s]", str(self.instance.pid))
         self.kill_instance()