Skip to content

Commit 788c796

Browse files
egor-zalenskiegor-zalenski
committed
#RI-6349 - Fix mas build
1 parent 2ef88a4 commit 788c796

File tree

3 files changed

+134
-133
lines changed

3 files changed

+134
-133
lines changed

‎.github/workflows/tests-e2e-docker.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
# Number of threads to run tests
47-
parallel: [0]
48-
# parallel: [0, 1, 2, 3]
47+
# parallel: [0]
48+
parallel: [0, 1, 2, 3]
4949

5050
steps:
5151
- uses: actions/checkout@v4
5252

5353
- name: Setup repository
5454
run: git config --global --add safe.directory /__w/RedisInsight/RedisInsight
5555

56-
- name: Setup Python
57-
uses: actions/setup-python@v5
58-
with:
59-
python-version: '3.11'
56+
# - name: Setup Python
57+
# uses: actions/setup-python@v5
58+
# with:
59+
# python-version: '3.11'
6060

6161
# SSH Debug
6262
- name: Enable SSH
@@ -76,7 +76,7 @@ jobs:
7676
# docker image load -i ./release/docker/docker-linux-alpine.amd64.tar
7777
7878
OUTPUT_FILE="docker-linux-alpine.amd64.tar"
79-
FILE_URL="https://s3.us-east-1.amazonaws.com/redisinsight.download/public/latest/docker/${OUTPUT_FILE}"
79+
FILE_URL="https://s3.us-east-1.amazonaws.com/redisinsight.test/public/pre-release/2.62.0/docker/${OUTPUT_FILE}"
8080
8181
wget -O "$OUTPUT_FILE" "$FILE_URL"
8282

‎tests/e2e/rte.docker-compose.yml‎

Lines changed: 125 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -154,134 +154,134 @@ services:
154154
logging: *logging
155155
image: redis:5
156156

157-
# # oss cluster (v7)
158-
# cluster-plain-creator-7:
159-
# logging: *logging
160-
# build:
161-
# context: ./rte/oss-cluster-7
162-
# dockerfile: creator.Dockerfile
163-
# depends_on:
164-
# - master-plain-7-1
165-
# - master-plain-7-2
166-
# - master-plain-7-3
167-
# master-plain-7-1:
168-
# logging: *logging
169-
# build: &cluster-plain-7-build ./rte/oss-cluster-7
170-
# ports:
171-
# - 8200:6379
172-
# networks:
173-
# default:
174-
# ipv4_address: 172.31.100.211
175-
# ssh:
176-
# ipv4_address: 172.33.100.211
177-
# master-plain-7-2:
178-
# logging: *logging
179-
# build: *cluster-plain-7-build
180-
# networks:
181-
# default:
182-
# ipv4_address: 172.31.100.212
183-
# master-plain-7-3:
184-
# logging: *logging
185-
# build: *cluster-plain-7-build
186-
# networks:
187-
# default:
188-
# ipv4_address: 172.31.100.213
157+
# oss cluster (v7)
158+
cluster-plain-creator-7:
159+
logging: *logging
160+
build:
161+
context: ./rte/oss-cluster-7
162+
dockerfile: creator.Dockerfile
163+
depends_on:
164+
- master-plain-7-1
165+
- master-plain-7-2
166+
- master-plain-7-3
167+
master-plain-7-1:
168+
logging: *logging
169+
build: &cluster-plain-7-build ./rte/oss-cluster-7
170+
ports:
171+
- 8200:6379
172+
networks:
173+
default:
174+
ipv4_address: 172.31.100.211
175+
ssh:
176+
ipv4_address: 172.33.100.211
177+
master-plain-7-2:
178+
logging: *logging
179+
build: *cluster-plain-7-build
180+
networks:
181+
default:
182+
ipv4_address: 172.31.100.212
183+
master-plain-7-3:
184+
logging: *logging
185+
build: *cluster-plain-7-build
186+
networks:
187+
default:
188+
ipv4_address: 172.31.100.213
189189

190-
# # oss cluster (v7) with rediserch > 2.2
191-
# cluster-rs-creator-7:
192-
# logging: *logging
193-
# build:
194-
# context: &cluster-rs-7-build ./rte/oss-cluster-7-rs
195-
# dockerfile: creator.Dockerfile
196-
# depends_on:
197-
# - master-rs-7-1
198-
# - master-rs-7-2
199-
# - master-rs-7-3
200-
# master-rs-7-1:
201-
# logging: *logging
202-
# build: *cluster-rs-7-build
203-
# ports:
204-
# - 8221:6379
205-
# networks:
206-
# default:
207-
# ipv4_address: 172.31.100.221
208-
# master-rs-7-2:
209-
# logging: *logging
210-
# build: *cluster-rs-7-build
211-
# networks:
212-
# default:
213-
# ipv4_address: 172.31.100.222
214-
# master-rs-7-3:
215-
# logging: *logging
216-
# build: *cluster-rs-7-build
217-
# networks:
218-
# default:
219-
# ipv4_address: 172.31.100.223
190+
# oss cluster (v7) with rediserch > 2.2
191+
cluster-rs-creator-7:
192+
logging: *logging
193+
build:
194+
context: &cluster-rs-7-build ./rte/oss-cluster-7-rs
195+
dockerfile: creator.Dockerfile
196+
depends_on:
197+
- master-rs-7-1
198+
- master-rs-7-2
199+
- master-rs-7-3
200+
master-rs-7-1:
201+
logging: *logging
202+
build: *cluster-rs-7-build
203+
ports:
204+
- 8221:6379
205+
networks:
206+
default:
207+
ipv4_address: 172.31.100.221
208+
master-rs-7-2:
209+
logging: *logging
210+
build: *cluster-rs-7-build
211+
networks:
212+
default:
213+
ipv4_address: 172.31.100.222
214+
master-rs-7-3:
215+
logging: *logging
216+
build: *cluster-rs-7-build
217+
networks:
218+
default:
219+
ipv4_address: 172.31.100.223
220220

221-
# # oss cluster with redisgears 2
222-
# gears-cluster-2-0-creator:
223-
# logging: *logging
224-
# image: redis:latest
225-
# entrypoint: ['/bin/sh', '-c', 'redis-cli --cluster create 172.31.100.191:6379 172.31.100.192:6379 172.31.100.193:6379 172.31.100.194:6379 172.31.100.195:6379 172.31.100.196:6379 --cluster-replicas 1 --cluster-yes && tail -f /dev/null']
226-
# depends_on:
227-
# - gears-cluster-2-0-node-1
228-
# - gears-cluster-2-0-node-2
229-
# - gears-cluster-2-0-node-3
230-
# - gears-cluster-2-0-node-4
231-
# - gears-cluster-2-0-node-5
232-
# - gears-cluster-2-0-node-6
233-
# gears-cluster-2-0-node-1:
234-
# logging: *logging
235-
# image: &gears-cluster-img redislabs/redisgears:edge
236-
# command: &gears-cluster-cmd redis-server --protected-mode no --loadmodule /build/target/release/libredisgears.so v8-plugin-path /build/target/release/libredisgears_v8_plugin.so --cluster-enabled yes
237-
# networks:
238-
# default:
239-
# ipv4_address: 172.31.100.191
240-
# gears-cluster-2-0-node-2:
241-
# logging: *logging
242-
# image: *gears-cluster-img
243-
# command: *gears-cluster-cmd
244-
# networks:
245-
# default:
246-
# ipv4_address: 172.31.100.192
247-
# gears-cluster-2-0-node-3:
248-
# logging: *logging
249-
# image: *gears-cluster-img
250-
# command: *gears-cluster-cmd
251-
# networks:
252-
# default:
253-
# ipv4_address: 172.31.100.193
254-
# gears-cluster-2-0-node-4:
255-
# logging: *logging
256-
# image: *gears-cluster-img
257-
# command: *gears-cluster-cmd
258-
# networks:
259-
# default:
260-
# ipv4_address: 172.31.100.194
261-
# gears-cluster-2-0-node-5:
262-
# logging: *logging
263-
# image: *gears-cluster-img
264-
# command: *gears-cluster-cmd
265-
# networks:
266-
# default:
267-
# ipv4_address: 172.31.100.195
268-
# gears-cluster-2-0-node-6:
269-
# logging: *logging
270-
# image: *gears-cluster-img
271-
# command: *gears-cluster-cmd
272-
# networks:
273-
# default:
274-
# ipv4_address: 172.31.100.196
221+
# oss cluster with redisgears 2
222+
gears-cluster-2-0-creator:
223+
logging: *logging
224+
image: redis:latest
225+
entrypoint: ['/bin/sh', '-c', 'redis-cli --cluster create 172.31.100.191:6379 172.31.100.192:6379 172.31.100.193:6379 172.31.100.194:6379 172.31.100.195:6379 172.31.100.196:6379 --cluster-replicas 1 --cluster-yes && tail -f /dev/null']
226+
depends_on:
227+
- gears-cluster-2-0-node-1
228+
- gears-cluster-2-0-node-2
229+
- gears-cluster-2-0-node-3
230+
- gears-cluster-2-0-node-4
231+
- gears-cluster-2-0-node-5
232+
- gears-cluster-2-0-node-6
233+
gears-cluster-2-0-node-1:
234+
logging: *logging
235+
image: &gears-cluster-img redislabs/redisgears:edge
236+
command: &gears-cluster-cmd redis-server --protected-mode no --loadmodule /build/target/release/libredisgears.so v8-plugin-path /build/target/release/libredisgears_v8_plugin.so --cluster-enabled yes
237+
networks:
238+
default:
239+
ipv4_address: 172.31.100.191
240+
gears-cluster-2-0-node-2:
241+
logging: *logging
242+
image: *gears-cluster-img
243+
command: *gears-cluster-cmd
244+
networks:
245+
default:
246+
ipv4_address: 172.31.100.192
247+
gears-cluster-2-0-node-3:
248+
logging: *logging
249+
image: *gears-cluster-img
250+
command: *gears-cluster-cmd
251+
networks:
252+
default:
253+
ipv4_address: 172.31.100.193
254+
gears-cluster-2-0-node-4:
255+
logging: *logging
256+
image: *gears-cluster-img
257+
command: *gears-cluster-cmd
258+
networks:
259+
default:
260+
ipv4_address: 172.31.100.194
261+
gears-cluster-2-0-node-5:
262+
logging: *logging
263+
image: *gears-cluster-img
264+
command: *gears-cluster-cmd
265+
networks:
266+
default:
267+
ipv4_address: 172.31.100.195
268+
gears-cluster-2-0-node-6:
269+
logging: *logging
270+
image: *gears-cluster-img
271+
command: *gears-cluster-cmd
272+
networks:
273+
default:
274+
ipv4_address: 172.31.100.196
275275

276-
# # redis enterprise
277-
# redis-enterprise:
278-
# logging: *logging
279-
# build: ./rte/redis-enterprise
280-
# cap_add:
281-
# - sys_resource
282-
# ports:
283-
# - 19443:9443
284-
# - 12000:12000
276+
# redis enterprise
277+
redis-enterprise:
278+
logging: *logging
279+
build: ./rte/redis-enterprise
280+
cap_add:
281+
- sys_resource
282+
ports:
283+
- 19443:9443
284+
- 12000:12000
285285
networks:
286286
default:
287287
name: "e2e-private-network"

‎tests/e2e/web.runner.ci.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import testcafe from 'testcafe';
1111
experimentalDecorators: true
1212
} })
1313
.src((process.env.TEST_FILES || 'tests/web/**/*.e2e.ts').split('\n'))
14-
.browsers(['chromium:headless --cache --allow-insecure-localhost --disable-search-engine-choice-screen --ignore-certificate-errors'])
14+
.browsers(['chrome:headless --cache --allow-insecure-localhost --disable-search-engine-choice-screen --ignore-certificate-errors'])
15+
// .browsers(['chromium:headless --cache --allow-insecure-localhost --disable-search-engine-choice-screen --ignore-certificate-errors'])
1516
.screenshots({
1617
path: 'report/screenshots/',
1718
takeOnFails: true,

0 commit comments

Comments
 (0)