File tree Expand file tree Collapse file tree 3 files changed +12
-7
lines changed Expand file tree Collapse file tree 3 files changed +12
-7
lines changed Original file line number Diff line number Diff line change @@ -72,13 +72,17 @@ jobs:
72
72
# Set up Docker Compose environment
73
73
- name : Set up Docker Compose environment
74
74
run : |
75
- docker compose -f src/test/resources/env/docker-compose.yml up -d
75
+ docker compose --profile all up -d --build
76
76
77
77
- name : Run tests
78
+ env :
79
+ USE_PREBUILT_REDIS : " true"
80
+ RE_CLUSTER : " true"
78
81
run : |
79
82
go test \
80
83
--ginkgo.skip-file="ring_test.go" \
81
84
--ginkgo.skip-file="sentinel_test.go" \
82
85
--ginkgo.skip-file="osscluster_test.go" \
83
86
--ginkgo.skip-file="pubsub_test.go" \
84
- --ginkgo.skip-file="gears_commands_test.go" \
87
+ --ginkgo.skip-file="gears_commands_test.go" \
88
+ --ginkgo.label-filter='!NonRedisEnterprise'
Original file line number Diff line number Diff line change 3
3
services :
4
4
5
5
redis :
6
- image : ${CLIENT_LIBS_TEST_IMAGE:- redislabs/client-libs-test:8.0-M01}
6
+ image : redislabs/client-libs-test:8.0-M01
7
7
container_name : redis-standalone
8
8
environment :
9
- - TLS_ENABLED=yes
10
9
- REDIS_CLUSTER=no
11
10
- PORT=6379
12
11
- TLS_PORT=6666
13
- command : ${REDIS_EXTRA_ARGS:--- enable-debug-command yes --enable- module-command yes --tls-auth-clients optional --save ""}
12
+ command : -- enable-module-command yes
14
13
ports :
15
14
- 6379:6379
16
15
- 6380:6379
Original file line number Diff line number Diff line change @@ -66,6 +66,7 @@ var cluster = &clusterScenario{
66
66
}
67
67
68
68
var RECluster = false
69
+ var USE_PREBUILT_REDIS = false
69
70
70
71
func registerProcess (port string , p * redisProcess ) {
71
72
if processes == nil {
@@ -82,8 +83,9 @@ var _ = BeforeSuite(func() {
82
83
}
83
84
var err error
84
85
RECluster , _ = strconv .ParseBool (os .Getenv ("RE_CLUSTER" ))
85
-
86
- if ! RECluster {
86
+ USE_PREBUILT_REDIS , _ = strconv .ParseBool (os .Getenv ("USE_PREBUILT_REDIS" ))
87
+ // panic("RECluster: " + strconv.FormatBool(RECluster) + " USE_PREBUILT_REDIS: " + strconv.FormatBool(USE_PREBUILT_REDIS))
88
+ if ! RECluster || ! USE_PREBUILT_REDIS {
87
89
88
90
redisMain , err = startRedis (redisPort )
89
91
Expect (err ).NotTo (HaveOccurred ())
You can’t perform that action at this time.
0 commit comments