Merge branch 'master' into v1.2.4

Author: DvirDukhan

.circleci/config.yml

@@ -138,7 +138,59 @@ commands:
             - artifacts/*.tgz
             - artifacts/*.tar
       - store_artifacts:
-          path: tests/logs
+          path: tests/flow/logs
+
+  valgrind-general-steps:
+    parameters:
+      test_args:
+        type: string
+        default: "CLUSTER=0 AOF=0"
+    steps:
+      - abort_for_docs
+      - abort_for_noci
+      - checkout-all
+      - restore_cache:
+          keys:
+          - build-dependencies-{{ checksum "get_deps.sh" }}
+          # If no exact match is found will get dependencies from source
+      - setup-build-system
+      - run:
+          name: Install dependencies
+          command: |
+            ./opt/readies/bin/getredis -v 6.0 --valgrind --force
+            ./get_deps.sh cpu
+      - run:
+          name: Build for valgrind
+          command: |
+            make -C opt all VALGRIND=1 SHOW=1
+      - run:
+          name: Test with valgrind
+          command: |
+            make -C opt test VALGRIND=1 <<parameters.test_args>>
+          no_output_timeout: 120m
+      - store_artifacts:
+          path: tests/flow/logs
+
+  build-and-test-gpu-steps:
+    steps:
+      - abort_for_docs
+      - abort_for_noci
+      - checkout-all
+      - relocate-docker-storage
+      - run:
+          name: Build
+          command: |
+            pip3 install --user jinja2
+            pushd opt/build/docker
+            make DOCKER_SUFFIX=".gpu-test" DOCKER_ARGS="-s dockerfile-gpu-test.tmpl" DOCKER_OPTS=--no-cache DEFAULT_TAG="redisai-gpu:latest-test"
+      - run:
+          name: Test
+          command: |
+            mkdir -p $HOME/tests
+            docker run --gpus all -v $HOME/tests:/build/tests/flow/logs -it --rm redisai-gpu:latest-test
+          no_output_timeout: 40m
+      - store_artifacts:
+          path: /home/circleci/tests
 
   valgrind-general-steps:
     parameters:
@@ -236,13 +288,15 @@ jobs:
       - setup_remote_docker
       - checkout-all
       - setup-automation
+
+      # since we run in parallel, we need to generate docker files with different suffixes hence the DOCKER_SUFFIX
       - run:
           name: Build for platform
           command: |
-            bash <(curl -fsSL https://get.docker.com)
+            bash <(curl -fsSL https://raw.githubusercontent.com/docker/docker-install/master/install.sh)
             pushd opt/build/docker
             docker login -u redisfab -p $DOCKER_REDISFAB_PWD
-            make build <<parameters.target>> OSNICK=<<parameters.osnick>> ARTIFACTS=1 VERBOSE=1 <<parameters.lite>>
+            make build DOCKER_SUFFIX="$$" <<parameters.target>> OSNICK=<<parameters.osnick>> PACK=1 VERBOSE=1 <<parameters.lite>>
             popd > /dev/null
             logstar=bin/artifacts/tests-logs-cpu.tgz
             logsdir=tests/logs/cpu
@@ -254,8 +308,6 @@ jobs:
           root: bin/
           paths:
             - artifacts/*
-      - store_artifacts:
-          path: test/logs
 
   coverage:
     docker:
@@ -284,6 +336,8 @@ jobs:
             make -C opt test SHOW=1 COV=1 CLUSTER=1
             make -C opt cov-upload
           no_output_timeout: 30m
+      - store_artifacts:
+          path: tests/flow/logs
 
   valgrind:
     parameters:
@@ -315,6 +369,15 @@ jobs:
           command: |
             make -C opt test VALGRIND=1 <<parameters.test_args>>
           no_output_timeout: 120m
+      - store_artifacts:
+          path: tests/flow/logs
+
+  valgrind-general-for-forked-prs:
+    docker:
+      - image: redisfab/rmbuilder:6.2.1-x64-buster
+    steps:
+      - only_run_if_forked_pull_request
+      - valgrind-general-steps
 
   valgrind-general-for-forked-prs:
     docker:
@@ -460,19 +523,18 @@ jobs:
           command: MODULE_VERSION=$CIRCLE_TAG VERBOSE=1 TEST=release ./tests/qa/run
       - run:
           name: Run QA Automation (AILite)
-          command: MODULE_VERSION=$CIRCLE_TAG VERBOSE=1 TEST=release VARIANT=lite ./tests/qa/run
-
+          command: MODULE_VERSION=$CIRCLE_TAG VERBOSE=1 TEST=release VARIANT=light ./tests/qa/run
 
-#  nightly-automation:
-#    docker:
-#      - image: redisfab/rmbuilder:6.2.1-x64-buster
-#    steps:
-#      - checkout
-#      - setup-automation
-#      - run:
-#          name: Run QA Automation
-#          command: MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly QUICK=1 ./tests/qa/run
 
+  #nightly-automation:
+  #  docker:
+  #    - image: redisfab/rmbuilder:6.2.1-x64-buster
+  #  steps:
+  #    - checkout
+  #    - setup-automation
+  #    - run:
+  #        name: Run QA Automation
+  #        command: MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly QUICK=1 ./tests/qa/run
 
 on-any-branch: &on-any-branch
   filters:
@@ -576,7 +638,7 @@ workflows:
                 - xenial
                 - bionic
               lite:
-                - "REDISAI_LITE=0 publish"
+                - "REDISAI_LITE=0 PUBLISH=1"
                 - "REDISAI_LITE=1"
               target:
                 - "CPU=1"
@@ -585,14 +647,14 @@ workflows:
           context: common
           <<: *on-dev-branches
           <<: *after-linter
+      - valgrind-general-for-forked-prs:
+          <<: *on-any-branch
+          <<: *after-linter
       - valgrind:
           name: valgrind-cluster
           test_args: GEN=0
           <<: *on-integ-branch
           <<: *after-linter
-      - valgrind-general-for-forked-prs:
-          <<: *on-any-branch
-          <<: *after-linter
       - deploy-snapshot:
           context: common
           <<: *after-platform-builds

Dockerfile

@@ -1,6 +1,6 @@
 # BUILD redisfab/redisai:${VERSION}-cpu-${ARCH}-${OSNICK}
 
-ARG REDIS_VER=6.2.3
+ARG REDIS_VER=6.2.4
 
 # OSNICK=bionic|stretch|buster
 ARG OSNICK=buster

Dockerfile.arm

@@ -1,6 +1,6 @@
 # BUILD redisfab/redisai:${VERSION}-jetson-${ARCH}-${OSNICK}
 
-ARG REDIS_VER=6.2.3
+ARG REDIS_VER=6.2.4
 
 # OSNICK=bionic|centos7|centos6
 ARG OSNICK=bionic