RedisGraph
diff --git a/‎.circleci/config.yml‎
Lines changed: 36 additions & 3 deletions b/‎.circleci/config.yml‎
Lines changed: 36 additions & 3 deletions
diff --git a/‎tests/Makefile‎
Lines changed: 8 additions & 1 deletion b/‎tests/Makefile‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎tests/benchmarks/local-runner.py‎
Lines changed: 0 additions & 140 deletions b/‎tests/benchmarks/local-runner.py‎
Lines changed: 0 additions & 140 deletions
@@ -86,6 +86,9 @@ commands:
       github_actor:
         type: string
         default: $CIRCLE_USERNAME
+      module_path:
+        type: string
+        default: /workspace/$MODULE_ARTIFACT
     steps:
       - run:
           name: Install remote benchmark tool dependencies
@@ -102,9 +105,9 @@ commands:
               export AWS_DEFAULT_REGION=$PERFORMANCE_EC2_REGION
               export EC2_PRIVATE_PEM=$PERFORMANCE_EC2_PRIVATE_PEM
 
-              python3 remote-runner.py \
+              redisbench-admin run-remote \
                 --terraform_bin_path /workspace/terraform \
-                --module_path /workspace/$MODULE_ARTIFACT \
+                --module_path << parameters.module_path >> \
                 --github_actor << parameters.github_actor >> \
                 --github_repo $CIRCLE_PROJECT_REPONAME \
                 --github_org $CIRCLE_PROJECT_USERNAME \
@@ -168,6 +171,18 @@ jobs:
           name: Test
           command: make test
 
+      - run:
+          name: Persist Artifact for CI benchmarks
+          command: |
+            strip src/$MODULE_ARTIFACT
+            mkdir -p /workspace
+            cp src/$MODULE_ARTIFACT /workspace
+
+      - persist_to_workspace:
+          root: /workspace
+          paths:
+            - '*.so'
+
   build_memcheck:
     docker:
       - image: redisfab/rmbuilder:6.0.9-x64-bionic
@@ -275,6 +290,16 @@ jobs:
           name: Run QA Automation
           command: MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly QUICK=1 ./tests/qa/run
 
+  performance_ci_automation_not_integ:
+    docker:
+      - image: 'redisfab/rmbuilder:6.0.9-x64-bionic'
+    steps:
+      - early_return_for_forked_pull_requests
+      - checkout
+      - attach_workspace:
+          at: /workspace
+      - benchmark-automation
+
   performance_ci_automation:
     docker:
       - image: redisfab/rmbuilder:6.0.9-x64-bionic
@@ -283,6 +308,10 @@ jobs:
       - checkout
       - attach_workspace:
           at: /workspace
+      - run:
+          name: Unzip module artifact
+          command: unzip /workspace/$PACKAGE_NAME.Linux-ubuntu18.04-x86_64.*.zip -d /workspace/
+
       - benchmark-automation
 
   nightly_performance_automation:
@@ -302,6 +331,7 @@ jobs:
 
       - benchmark-automation:
           github_actor: "ci.nightly"
+          module_path: "/root/project/src/$PACKAGE_NAME.so"
 
 
 on-any-branch: &on-any-branch
@@ -389,8 +419,11 @@ workflows:
           requires:
             - platform_build
             - build_macos
+      - performance_ci_automation_not_integ:
+          <<: *not-on-integ-branch
+          requires:
+            - build
       - performance_ci_automation:
-          <<: *on-integ-branch
           requires:
             - platform_build
 
 
@@ -10,6 +10,13 @@ ifneq ($(V),)
 	TEST_ARGS += --verbose
 endif
 
+ifneq ($(REMOTE),)
+	BENCHMARK_ARGS = redisbench-admin run-remote 
+else
+	BENCHMARK_ARGS = redisbench-admin run-local 
+endif
+
+BENCHMARK_ARGS += --module_path $(shell pwd)/../src/redisgraph.so
 ifneq ($(BENCHMARK),)
 	BENCHMARK_ARGS += --test $(BENCHMARK)
 endif
@@ -48,7 +55,7 @@ memcheck:
 	./memcheck.sh
 
 benchmark:
-	cd benchmarks; python3 local-runner.py $(BENCHMARK_ARGS) ; cd ..
+	cd benchmarks; $(BENCHMARK_ARGS) ; cd ..
 
 clean:
 	@find . -name '*.[oad]' -type f -delete