Merge branch 'master' into disable-nightly-automation

Author: DvirDukhan

.circleci/config.yml

@@ -458,6 +458,10 @@ jobs:
       - run:
           name: Run QA Automation
           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
+
 
   #nightly-automation:
   #  docker:
@@ -469,7 +473,6 @@ jobs:
   #        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:
     branches:

Dockerfile

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

Dockerfile.arm

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

Dockerfile.gpu

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

Dockerfile.gpu-test

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

Dockerfile.jetson

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

opt/build/docker/Makefile

@@ -11,7 +11,7 @@ REPO=redisai
 # LATEST_BRANCH=1.2
 INT_BRANCHES=1.2
 
-REDIS_VER:=6.0.9
+REDIS_VER:=6.2.3
 REDISAI_LITE:=0
 
 export ART_DIR=$(ROOT)/bin/artifacts

tests/qa/RS_VERSIONS

@@ -1,2 +1 @@
-6.0.12-58
-100.0.0-2400
+100.0.0-2440

tests/qa/RS_VERSIONS-lite

@@ -0,0 +1,2 @@
+6.0.12-58
+100.0.0-2440

tests/qa/nightly.json

@@ -1,6 +1,6 @@
 {
   "service_id": "single_module_test_cycle",
-  "name": "redisai automation-testing",
+  "name": "redisai{{VARIANT}} automation-testing",
   "properties": {
     "sut_version": "master",
     "email_recipients": "[email protected]",
@@ -15,7 +15,7 @@
         "teardown": true,
         "name": "bionic-amd64-aws",
         "concurrency": 1,
-		"module_url": "http://redismodules.s3.amazonaws.com/{{RS_MODULE_FILE_PREFIX}}/snapshots/{{RS_MODULE_FILE_PREFIX}}-cpu.linux-bionic-x64.master.zip"
+		"module_url": "http://redismodules.s3.amazonaws.com/{{RS_MODULE_FILE_PREFIX}}/snapshots/{{RS_MODULE_FILE_PREFIX}}-cpu.linux-bionic-x64.master{{VARIANT}}.zip"
       }
     ]
   }

tests/qa/release.json

@@ -1,6 +1,6 @@
 {
   "service_id": "single_module_test_cycle",
-  "name": "redisai automation-testing",
+  "name": "redisai{{VARIANT}} automation-testing",
   "properties": {
     "sut_version": "{{RS_VERSION}}",
     "email_recipients": "[email protected]",
@@ -15,13 +15,13 @@
         "teardown": true,
         "name": "xenial-amd64-aws",
         "concurrency": 1,
-		"module_url": "http://redismodules.s3.amazonaws.com/{{RS_MODULE_LC}}/{{RS_MODULE_FILE_PREFIX}}.linux-xenial-x64.{{MODULE_VERSION}}.zip"
+		"module_url": "http://redismodules.s3.amazonaws.com/{{RS_MODULE_LC}}/{{RS_MODULE_FILE_PREFIX}}.linux-xenial-x64.{{MODULE_VERSION}}{{VARIANT}}.zip"
       },
       {
         "teardown": true,
         "name": "bionic-amd64-aws",
         "concurrency": 1,
-		"module_url": "http://redismodules.s3.amazonaws.com/{{RS_MODULE_LC}}/{{RS_MODULE_FILE_PREFIX}}.linux-bionic-x64.{{MODULE_VERSION}}.zip"
+		"module_url": "http://redismodules.s3.amazonaws.com/{{RS_MODULE_LC}}/{{RS_MODULE_FILE_PREFIX}}.linux-bionic-x64.{{MODULE_VERSION}}{{VARIANT}}.zip"
       }
     ]
   }

tests/qa/run

@@ -30,6 +30,7 @@ fi
 export RS_MODULE=RedisAI
 export RS_MODULE_LC=${RS_MODULE,,}
 export RS_MODULE_FILE_PREFIX=redisai-cpu
+export VARIANT=${VARIANT}  # for variants such as RedisAILite. We append -lite (see circleci for an example)
 
 if [[ -z $QA_AUTOMATION_TOKEN && $NOP != 1 ]]; then
 	echo "Variable QA_AUTOMATION_TOKEN is undefined." >&2
@@ -59,7 +60,7 @@ run_test() {
 	cd $HERE
 
 	json_in=$(mktemp /tmp/$TEST.json.XXXX)
-	$READIES/bin/xtx -e RS_MODULE -e RS_MODULE_LC -e RS_MODULE_FILE_PREFIX -e MODULE_VERSION -e RS_VERSION $TEST.json > $json_in
+	$READIES/bin/xtx -e VARIANT -e RS_MODULE -e RS_MODULE_LC -e RS_MODULE_FILE_PREFIX -e MODULE_VERSION -e RS_VERSION $TEST.json > $json_in
 	(( VERBOSE >= 1 )) && cat $json_in
 
 	if [[ $NOP == 1 ]]; then
@@ -89,10 +90,12 @@ run_test() {
 }
 
 rc=0
+# By default we use RS_VERSIONS, but with variants they may need to specify their own redis verisons, hence this file
+VERSIONFILE=${HERE}/RS_VERSIONS${VARIANT}
 if [[ $QUICK == 1 ]]; then
-	RS_VERSIONS=$(cat $HERE/RS_VERSIONS | head -1)
+	RS_VERSIONS=$(cat $VERSIONFILE | head -1)
 else
-	RS_VERSIONS=$(cat $HERE/RS_VERSIONS)
+    RS_VERSIONS=$(cat $VERSIONFILE)
 fi
 for RS_VERSION in $RS_VERSIONS; do
 	run_test $RS_VERSION