File tree Expand file tree Collapse file tree 6 files changed +21
-11
lines changed
Expand file tree Collapse file tree 6 files changed +21
-11
lines changed Original file line number Diff line number Diff line change @@ -414,6 +414,10 @@ jobs:
414414 - run :
415415 name : Run QA Automation
416416 command : MODULE_VERSION=$CIRCLE_TAG VERBOSE=1 TEST=release ./tests/qa/run
417+ - run :
418+ name : Run QA Automation (AILite)
419+ command : MODULE_VERSION=$CIRCLE_TAG VERBOSE=1 TEST=release VARIANT=lite ./tests/qa/run
420+
417421
418422 nightly-automation :
419423 docker :
@@ -424,7 +428,9 @@ jobs:
424428 - run :
425429 name : Run QA Automation
426430 command : MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly QUICK=1 ./tests/qa/run
427-
431+ - run :
432+ name : Run QA Automation (AILite)
433+ command : MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly VARIANT=lite QUICK=1 ./tests/qa/run
428434
429435on-any-branch : &on-any-branch
430436 filters :
Original file line number Diff line number Diff line change 1- 6.0.12-58
2- 100.0.0-2400
1+ 100.0.0-2440
Original file line number Diff line number Diff line change 1+ 6.0.12-58
2+ 100.0.0-2440
Original file line number Diff line number Diff line change 11{
22 "service_id" : " single_module_test_cycle" ,
3- "name" : " redisai automation-testing" ,
3+ "name" : " redisai{{VARIANT}} automation-testing" ,
44 "properties" : {
55 "sut_version" : " master" ,
66 "email_recipients" : " redisaidev-aaaacob2o7eeecrhkqwua77kku@redislabs.slack.com" ,
1515 "teardown" : true ,
1616 "name" : " bionic-amd64-aws" ,
1717 "concurrency" : 1 ,
18- "module_url" : " http://redismodules.s3.amazonaws.com/{{RS_MODULE_FILE_PREFIX}}/snapshots/{{RS_MODULE_FILE_PREFIX}}-cpu.linux-bionic-x64.master.zip"
18+ "module_url" : " http://redismodules.s3.amazonaws.com/{{RS_MODULE_FILE_PREFIX}}/snapshots/{{RS_MODULE_FILE_PREFIX}}-cpu.linux-bionic-x64.master{{VARIANT}} .zip"
1919 }
2020 ]
2121 }
Original file line number Diff line number Diff line change 11{
22 "service_id" : " single_module_test_cycle" ,
3- "name" : " redisai automation-testing" ,
3+ "name" : " redisai{{VARIANT}} automation-testing" ,
44 "properties" : {
55 "sut_version" : " {{RS_VERSION}}" ,
66 "email_recipients" : " redisaidev-aaaacob2o7eeecrhkqwua77kku@redislabs.slack.com" ,
1515 "teardown" : true ,
1616 "name" : " xenial-amd64-aws" ,
1717 "concurrency" : 1 ,
18- "module_url" : " http://redismodules.s3.amazonaws.com/{{RS_MODULE_LC}}/{{RS_MODULE_FILE_PREFIX}}.linux-xenial-x64.{{MODULE_VERSION}}.zip"
18+ "module_url" : " http://redismodules.s3.amazonaws.com/{{RS_MODULE_LC}}/{{RS_MODULE_FILE_PREFIX}}.linux-xenial-x64.{{MODULE_VERSION}}{{VARIANT}} .zip"
1919 },
2020 {
2121 "teardown" : true ,
2222 "name" : " bionic-amd64-aws" ,
2323 "concurrency" : 1 ,
24- "module_url" : " http://redismodules.s3.amazonaws.com/{{RS_MODULE_LC}}/{{RS_MODULE_FILE_PREFIX}}.linux-bionic-x64.{{MODULE_VERSION}}.zip"
24+ "module_url" : " http://redismodules.s3.amazonaws.com/{{RS_MODULE_LC}}/{{RS_MODULE_FILE_PREFIX}}.linux-bionic-x64.{{MODULE_VERSION}}{{VARIANT}} .zip"
2525 }
2626 ]
2727 }
Original file line number Diff line number Diff line change 3030export RS_MODULE=RedisAI
3131export RS_MODULE_LC=${RS_MODULE,,}
3232export RS_MODULE_FILE_PREFIX=redisai-cpu
33+ export VARIANT=${VARIANT} # for variants such as RedisAILite. We append -lite (see circleci for an example)
3334
3435if [[ -z $QA_AUTOMATION_TOKEN && $NOP != 1 ]]; then
3536 echo " Variable QA_AUTOMATION_TOKEN is undefined." >&2
@@ -59,7 +60,7 @@ run_test() {
5960 cd $HERE
6061
6162 json_in=$( mktemp /tmp/$TEST .json.XXXX)
62- $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
63+ $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
6364 (( VERBOSE >= 1 )) && cat $json_in
6465
6566 if [[ $NOP == 1 ]]; then
@@ -89,10 +90,12 @@ run_test() {
8990}
9091
9192rc=0
93+ # By default we use RS_VERSIONS, but with variants they may need to specify their own redis verisons, hence this file
94+ VERSIONFILE=${HERE} /RS_VERSIONS${VARIANT}
9295if [[ $QUICK == 1 ]]; then
93- RS_VERSIONS=$( cat $HERE /RS_VERSIONS | head -1)
96+ RS_VERSIONS=$( cat $VERSIONFILE | head -1)
9497else
95- RS_VERSIONS=$( cat $HERE /RS_VERSIONS )
98+ RS_VERSIONS=$( cat $VERSIONFILE )
9699fi
97100for RS_VERSION in $RS_VERSIONS ; do
98101 run_test $RS_VERSION
You can’t perform that action at this time.
0 commit comments