QA automation update (2) (RedisJSON#507)

rafie · web-flow · commit 19c5f19688bf · 2021-11-08T11:23:38.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -295,7 +295,7 @@ jobs:
       - setup-automation
       - run:
           name: Run QA Automation
-          command: ./tests/qa/qatests -v -t release -m "$CIRCLE_TAG"
+          command: MODULE_VERSION=$CIRCLE_TAG VERBOSE=1 TEST=release ./tests/qa/run
 
   nightly-automation:
     docker:
@@ -305,7 +305,7 @@ jobs:
       - setup-automation
       - run:
           name: Run QA Automation
-          command: ./tests/qa/qatests -v -t nightly -m "$CIRCLE_BRANCH" --snapshot --quick
+          command: MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly QUICK=1 ./tests/qa/run
 
   performance-automation:
     docker:
diff --git a/Makefile b/Makefile
@@ -123,10 +123,17 @@ lint:
 
 #----------------------------------------------------------------------------------------------
 
+ifeq ($(OS),macos)
+BINUTILS_PREFIX:=$(shell brew --prefix binutils)
+OBJCOPY:=$(BINUTILS_PREFIX)/bin/objcopy
+else
+OBJCOPY:=objcopy
+endif
+
 define extract_symbols
-$(SHOW)objcopy --only-keep-debug $1 $1.debug
-$(SHOW)objcopy --strip-debug $1
-$(SHOW)objcopy --add-gnu-debuglink $1.debug $1
+$(SHOW)$(OBJCOPY) --only-keep-debug $1 $1.debug
+$(SHOW)$(OBJCOPY) --strip-debug $1
+$(SHOW)$(OBJCOPY) --add-gnu-debuglink $1.debug $1
 endef
 
 RUST_SOEXT.linux=so
diff --git a/tests/qa/qatests b/tests/qa/qatests
@@ -9,8 +9,8 @@ import json
 import requests
 
 HERE = os.path.dirname(__file__)
-ROOT = os.path.abspath(os.path.join(HERE, ".."))
-READIES = "/w/rafi_1/readies"
+ROOT = os.path.abspath(os.path.join(HERE, "../.."))
+READIES = os.path.abspath(os.path.join(ROOT, "deps/readies"))
 sys.path.insert(0, READIES)
 import paella
 
@@ -65,7 +65,7 @@ RS_VERSIONS file includes Redis Enterprive versions for release tests.
 
 
 class Test:
-    def __init__(self, token, test_fname, modver, snapshot, rsver, osnick, light):
+    def __init__(self, token, test_fname, modver, snapshot, rsver, osnick):
         global NOP, VERBOSE
 
         self.token = token
@@ -74,7 +74,6 @@ class Test:
         self.snapshot = snapshot
         self.rsver = rsver
         self.osnick = osnick
-        self.light = light
 
         os.environ['RS_MODULE_DIR'] = 'rejson'
         self.rsmod = 'ReJSON'
@@ -126,7 +125,6 @@ class Test:
         if NOP:
             return 0
 
-        BB()
         res = requests.post(f"https://{OPERETO3_URL}/processes", verify=False,
                             headers={'Authorization': f'Bearer {self.token}',
                                      'Content-Type': 'application/json'},
@@ -157,7 +155,7 @@ class Test:
 @click.option('--nop', is_flag=True, default=False, help='Dry run')
 @click.option('--verbose', '-v', is_flag=True, default=False, help='Be verbose')
 @click.option('--verbosity', type=int, default=0, help='Verbosity level')
-def main(token, test, modver, snapshot, rsver, osnick, light, quick, nop, verbose, verbosity, *args, **kwargs):
+def main(token, test, modver, snapshot, rsver, osnick, common, quick, nop, verbose, verbosity, *args, **kwargs):
     BB()
     global NOP, VERBOSE
     VERBOSE = 1 if verbose else verbosity
@@ -172,13 +170,13 @@ def main(token, test, modver, snapshot, rsver, osnick, light, quick, nop, verbos
         raise click.ClickException(f"Invalid test name: {test}")
 
     if rsver is not None:
-        Test(token, test_fname, modver, snapshot, rsver, osnick, light).run()
+        Test(token, test_fname, modver, snapshot, rsver, osnick).run()
     else:
         rs_versions = paella.flines(os.path.join(HERE, 'RS_VERSIONS'))
         if quick:
             rs_versions = [rs_versions[0]]
         for rsver in rs_versions:
-            Test(token, test_fname, modver, snapshot, rsver, osnick, light).run()
+            Test(token, test_fname, modver, snapshot, rsver, osnick).run()
 
 
 if __name__ == '__main__':
