Skip to content

Commit e4f2647

Browse files
committed
Add docker compose file
1 parent 1dcda5e commit e4f2647

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,17 @@ jobs:
7272
# Set up Docker Compose environment
7373
- name: Set up Docker Compose environment
7474
run: |
75-
docker compose -f src/test/resources/env/docker-compose.yml up -d
75+
docker compose --profile all up -d --build
7676
7777
- name: Run tests
78+
env:
79+
USE_PREBUILT_REDIS: "true"
80+
RE_CLUSTER: "true"
7881
run: |
7982
go test \
8083
--ginkgo.skip-file="ring_test.go" \
8184
--ginkgo.skip-file="sentinel_test.go" \
8285
--ginkgo.skip-file="osscluster_test.go" \
8386
--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'

.github/docker-compose.yml renamed to docker-compose.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
services:
44

55
redis:
6-
image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:8.0-M01}
6+
image: redislabs/client-libs-test:8.0-M01
77
container_name: redis-standalone
88
environment:
9-
- TLS_ENABLED=yes
109
- REDIS_CLUSTER=no
1110
- PORT=6379
1211
- 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
1413
ports:
1514
- 6379:6379
1615
- 6380:6379

main_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ var cluster = &clusterScenario{
6666
}
6767

6868
var RECluster = false
69+
var USE_PREBUILT_REDIS = false
6970

7071
func registerProcess(port string, p *redisProcess) {
7172
if processes == nil {
@@ -82,8 +83,9 @@ var _ = BeforeSuite(func() {
8283
}
8384
var err error
8485
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 {
8789

8890
redisMain, err = startRedis(redisPort)
8991
Expect(err).NotTo(HaveOccurred())

0 commit comments

Comments
 (0)