Skip to content

adding lite to the release automation #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 1, 2021
Merged

adding lite to the release automation #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09adf23
adding lite to the release automation
chayim Jun 1, 2021
3736f7b
adding support for targetted redis versions
chayim Jun 1, 2021
e232290
Update RS_VERSIONS
TomerHekmati Jun 1, 2021
916d6b5
Update RS_VERSIONS-lite
TomerHekmati Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -468,7 +472,9 @@ jobs:
- run:
name: Run QA Automation
command: MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly QUICK=1 ./tests/qa/run

- run:
name: Run QA Automation (AILite)
command: MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly VARIANT=lite QUICK=1 ./tests/qa/run

on-any-branch: &on-any-branch
filters:
Expand Down
3 changes: 1 addition & 2 deletions tests/qa/RS_VERSIONS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
6.0.12-58
100.0.0-2400
100.0.0-2440
2 changes: 2 additions & 0 deletions tests/qa/RS_VERSIONS-lite
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
6.0.12-58
100.0.0-2440
4 changes: 2 additions & 2 deletions tests/qa/nightly.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]",
Expand All @@ -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"
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions tests/qa/release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]",
Expand All @@ -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"
}
]
}
Expand Down
9 changes: 6 additions & 3 deletions tests/qa/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We send VARIANT=lite from circleci.yaml but the file name is RS_VERSIONS-lite (with a dash) - is that a problem?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CircleCI passes in VARIANT=-lite, which we use to build the file. This was validated with @tomerhekredis

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
Expand Down