Skip to content

Commit d42ad15

Browse files
chayimTomerHekmati
andauthored
adding lite to the release automation (#773)
Co-authored-by: tomerhekredis <[email protected]>
1 parent 865661d commit d42ad15

File tree

6 files changed

+21
-11
lines changed

6 files changed

+21
-11
lines changed

.circleci/config.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,10 @@ jobs:
458458
- run:
459459
name: Run QA Automation
460460
command: MODULE_VERSION=$CIRCLE_TAG VERBOSE=1 TEST=release ./tests/qa/run
461+
- run:
462+
name: Run QA Automation (AILite)
463+
command: MODULE_VERSION=$CIRCLE_TAG VERBOSE=1 TEST=release VARIANT=lite ./tests/qa/run
464+
461465

462466
nightly-automation:
463467
docker:
@@ -468,7 +472,9 @@ jobs:
468472
- run:
469473
name: Run QA Automation
470474
command: MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly QUICK=1 ./tests/qa/run
471-
475+
- run:
476+
name: Run QA Automation (AILite)
477+
command: MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly VARIANT=lite QUICK=1 ./tests/qa/run
472478

473479
on-any-branch: &on-any-branch
474480
filters:

tests/qa/RS_VERSIONS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
6.0.12-58
2-
100.0.0-2400
1+
100.0.0-2440

tests/qa/RS_VERSIONS-lite

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
6.0.12-58
2+
100.0.0-2440

tests/qa/nightly.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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": "[email protected]",
@@ -15,7 +15,7 @@
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
}

tests/qa/release.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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": "[email protected]",
@@ -15,13 +15,13 @@
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
}

tests/qa/run

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ fi
3030
export RS_MODULE=RedisAI
3131
export RS_MODULE_LC=${RS_MODULE,,}
3232
export RS_MODULE_FILE_PREFIX=redisai-cpu
33+
export VARIANT=${VARIANT} # for variants such as RedisAILite. We append -lite (see circleci for an example)
3334

3435
if [[ -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

9192
rc=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}
9295
if [[ $QUICK == 1 ]]; then
93-
RS_VERSIONS=$(cat $HERE/RS_VERSIONS | head -1)
96+
RS_VERSIONS=$(cat $VERSIONFILE | head -1)
9497
else
95-
RS_VERSIONS=$(cat $HERE/RS_VERSIONS)
98+
RS_VERSIONS=$(cat $VERSIONFILE)
9699
fi
97100
for RS_VERSION in $RS_VERSIONS; do
98101
run_test $RS_VERSION

0 commit comments

Comments
 (0)