Skip to content

Commit 8f58235

Browse files
committed
chore(ci): Use redis 8 rc2 image. (#3361)
* chore(ci): Use redis 8 rc2 image * test(timeseries): fix duplicatePolicy check
1 parent 09dc351 commit 8f58235

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.github/actions/run-tests/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
2626
# Mapping of redis version to redis testing containers
2727
declare -A redis_version_mapping=(
28-
["8.0-RC1"]="8.0-RC1-pre"
28+
["8.0-RC2"]="8.0-RC2-pre"
2929
["7.4.2"]="rs-7.4.0-v2"
3030
["7.2.7"]="rs-7.2.0-v14"
3131
)

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
redis-version:
21-
- "8.0-RC1" # 8.0 RC1
21+
- "8.0-RC2" # 8.0 RC2
2222
- "7.4.2" # should use redis stack 7.4
2323
go-version:
2424
- "1.23.x"
@@ -43,7 +43,7 @@ jobs:
4343
4444
# Mapping of redis version to redis testing containers
4545
declare -A redis_version_mapping=(
46-
["8.0-RC1"]="8.0-RC1-pre"
46+
["8.0-RC2"]="8.0-RC2-pre"
4747
["7.4.2"]="rs-7.4.0-v2"
4848
)
4949
if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
@@ -72,7 +72,7 @@ jobs:
7272
fail-fast: false
7373
matrix:
7474
redis-version:
75-
- "8.0-RC1" # 8.0 RC1
75+
- "8.0-RC2" # 8.0 RC2
7676
- "7.4.2" # should use redis stack 7.4
7777
- "7.2.7" # should redis stack 7.2
7878
go-version:

timeseries_commands_test.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,21 @@ var _ = Describe("RedisTimeseries commands", Label("timeseries"), func() {
269269
if client.Options().Protocol == 2 {
270270
Expect(resultInfo["labels"].([]interface{})[0]).To(BeEquivalentTo([]interface{}{"Time", "Series"}))
271271
Expect(resultInfo["retentionTime"]).To(BeEquivalentTo(10))
272-
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil))
272+
if RedisVersion >= 8 {
273+
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo("block"))
274+
} else {
275+
// Older versions of Redis had a bug where the duplicate policy was not set correctly
276+
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil))
277+
}
273278
} else {
274279
Expect(resultInfo["labels"].(map[interface{}]interface{})["Time"]).To(BeEquivalentTo("Series"))
275280
Expect(resultInfo["retentionTime"]).To(BeEquivalentTo(10))
276-
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil))
281+
if RedisVersion >= 8 {
282+
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo("block"))
283+
} else {
284+
// Older versions of Redis had a bug where the duplicate policy was not set correctly
285+
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil))
286+
}
277287
}
278288
opt = &redis.TSAlterOptions{DuplicatePolicy: "min"}
279289
resultAlter, err = client.TSAlter(ctx, "1", opt).Result()

0 commit comments

Comments
 (0)