@@ -19,10 +19,12 @@ all: hub \
19
19
sessionqueuer \
20
20
event_bus \
21
21
chrome \
22
+ edge \
22
23
firefox \
23
24
opera \
24
25
docker \
25
26
standalone_chrome \
27
+ standalone_edge \
26
28
standalone_firefox \
27
29
standalone_opera \
28
30
standalone_docker \
@@ -37,11 +39,13 @@ generate_all: \
37
39
generate_event_bus \
38
40
generate_node_base \
39
41
generate_chrome \
42
+ generate_edge \
40
43
generate_firefox \
41
44
generate_opera \
42
45
generate_docker \
43
46
generate_standalone_firefox \
44
47
generate_standalone_chrome \
48
+ generate_standalone_edge \
45
49
generate_standalone_opera \
46
50
generate_standalone_docker
47
51
@@ -100,6 +104,12 @@ generate_chrome:
100
104
chrome : node_base generate_chrome
101
105
cd ./NodeChrome && docker build $(BUILD_ARGS ) -t $(NAME ) /node-chrome:$(TAG_VERSION ) .
102
106
107
+ generate_edge :
108
+ cd ./NodeEdge && ./generate.sh $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
109
+
110
+ edge : node_base generate_edge
111
+ cd ./NodeEdge && docker build $(BUILD_ARGS ) -t $(NAME ) /node-edge:$(TAG_VERSION ) .
112
+
103
113
generate_firefox :
104
114
cd ./NodeFirefox && ./generate.sh $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
105
115
@@ -136,6 +146,12 @@ generate_standalone_chrome:
136
146
standalone_chrome : chrome generate_standalone_chrome
137
147
cd ./StandaloneChrome && docker build $(BUILD_ARGS ) -t $(NAME ) /standalone-chrome:$(TAG_VERSION ) .
138
148
149
+ generate_standalone_edge :
150
+ cd ./Standalone && ./generate.sh StandaloneEdge node-edge $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
151
+
152
+ standalone_edge : edge generate_standalone_edge
153
+ cd ./StandaloneEdge && docker build $(BUILD_ARGS ) -t $(NAME ) /standalone-edge:$(TAG_VERSION ) .
154
+
139
155
generate_standalone_opera :
140
156
cd ./Standalone && ./generate.sh StandaloneOpera node-opera $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
141
157
@@ -153,6 +169,9 @@ tag_and_push_browser_images: tag_and_push_chrome_images tag_and_push_firefox_ima
153
169
tag_and_push_chrome_images :
154
170
./tag_and_push_browser_images.sh $(VERSION ) $(BUILD_DATE ) $(NAMESPACE ) $(PUSH_IMAGE ) chrome
155
171
172
+ tag_and_push_edge_images :
173
+ ./tag_and_push_browser_images.sh $(VERSION ) $(BUILD_DATE ) $(NAMESPACE ) $(PUSH_IMAGE ) edge
174
+
156
175
tag_and_push_firefox_images :
157
176
./tag_and_push_browser_images.sh $(VERSION ) $(BUILD_DATE ) $(NAMESPACE ) $(PUSH_IMAGE ) firefox
158
177
@@ -169,10 +188,12 @@ tag_latest:
169
188
docker tag $(NAME ) /event-bus:$(TAG_VERSION ) $(NAME ) /event-bus:latest
170
189
docker tag $(NAME ) /node-base:$(TAG_VERSION ) $(NAME ) /node-base:latest
171
190
docker tag $(NAME ) /node-chrome:$(TAG_VERSION ) $(NAME ) /node-chrome:latest
191
+ docker tag $(NAME ) /node-edge:$(TAG_VERSION ) $(NAME ) /node-edge:latest
172
192
docker tag $(NAME ) /node-firefox:$(TAG_VERSION ) $(NAME ) /node-firefox:latest
173
193
docker tag $(NAME ) /node-opera:$(TAG_VERSION ) $(NAME ) /node-opera:latest
174
194
docker tag $(NAME ) /node-docker:$(TAG_VERSION ) $(NAME ) /node-docker:latest
175
195
docker tag $(NAME ) /standalone-chrome:$(TAG_VERSION ) $(NAME ) /standalone-chrome:latest
196
+ docker tag $(NAME ) /standalone-edge:$(TAG_VERSION ) $(NAME ) /standalone-edge:latest
176
197
docker tag $(NAME ) /standalone-firefox:$(TAG_VERSION ) $(NAME ) /standalone-firefox:latest
177
198
docker tag $(NAME ) /standalone-opera:$(TAG_VERSION ) $(NAME ) /standalone-opera:latest
178
199
docker tag $(NAME ) /standalone-docker:$(TAG_VERSION ) $(NAME ) /standalone-docker:latest
@@ -187,10 +208,12 @@ release_latest:
187
208
docker push $(NAME ) /event-bus:latest
188
209
docker push $(NAME ) /node-base:latest
189
210
docker push $(NAME ) /node-chrome:latest
211
+ docker push $(NAME ) /node-edge:latest
190
212
docker push $(NAME ) /node-firefox:latest
191
213
docker push $(NAME ) /node-opera:latest
192
214
docker push $(NAME ) /node-docker:latest
193
215
docker push $(NAME ) /standalone-chrome:latest
216
+ docker push $(NAME ) /standalone-edge:latest
194
217
docker push $(NAME ) /standalone-firefox:latest
195
218
docker push $(NAME ) /standalone-opera:latest
196
219
docker push $(NAME ) /standalone-docker:latest
@@ -205,10 +228,12 @@ tag_major_minor:
205
228
docker tag $(NAME ) /event-bus:$(TAG_VERSION ) $(NAME ) /event-bus:$(MAJOR )
206
229
docker tag $(NAME ) /node-base:$(TAG_VERSION ) $(NAME ) /node-base:$(MAJOR )
207
230
docker tag $(NAME ) /node-chrome:$(TAG_VERSION ) $(NAME ) /node-chrome:$(MAJOR )
231
+ docker tag $(NAME ) /node-edge:$(TAG_VERSION ) $(NAME ) /node-edge:$(MAJOR )
208
232
docker tag $(NAME ) /node-firefox:$(TAG_VERSION ) $(NAME ) /node-firefox:$(MAJOR )
209
233
docker tag $(NAME ) /node-opera:$(TAG_VERSION ) $(NAME ) /node-opera:$(MAJOR )
210
234
docker tag $(NAME ) /node-docker:$(TAG_VERSION ) $(NAME ) /node-docker:$(MAJOR )
211
235
docker tag $(NAME ) /standalone-chrome:$(TAG_VERSION ) $(NAME ) /standalone-chrome:$(MAJOR )
236
+ docker tag $(NAME ) /standalone-edge:$(TAG_VERSION ) $(NAME ) /standalone-edge:$(MAJOR )
212
237
docker tag $(NAME ) /standalone-firefox:$(TAG_VERSION ) $(NAME ) /standalone-firefox:$(MAJOR )
213
238
docker tag $(NAME ) /standalone-opera:$(TAG_VERSION ) $(NAME ) /standalone-opera:$(MAJOR )
214
239
docker tag $(NAME ) /standalone-docker:$(TAG_VERSION ) $(NAME ) /standalone-docker:$(MAJOR )
@@ -221,10 +246,12 @@ tag_major_minor:
221
246
docker tag $(NAME ) /event-bus:$(TAG_VERSION ) $(NAME ) /event-bus:$(MAJOR ) .$(MINOR )
222
247
docker tag $(NAME ) /node-base:$(TAG_VERSION ) $(NAME ) /node-base:$(MAJOR ) .$(MINOR )
223
248
docker tag $(NAME ) /node-chrome:$(TAG_VERSION ) $(NAME ) /node-chrome:$(MAJOR ) .$(MINOR )
249
+ docker tag $(NAME ) /node-edge:$(TAG_VERSION ) $(NAME ) /node-edge:$(MAJOR ) .$(MINOR )
224
250
docker tag $(NAME ) /node-firefox:$(TAG_VERSION ) $(NAME ) /node-firefox:$(MAJOR ) .$(MINOR )
225
251
docker tag $(NAME ) /node-opera:$(TAG_VERSION ) $(NAME ) /node-opera:$(MAJOR ) .$(MINOR )
226
252
docker tag $(NAME ) /node-docker:$(TAG_VERSION ) $(NAME ) /node-docker:$(MAJOR ) .$(MINOR )
227
253
docker tag $(NAME ) /standalone-chrome:$(TAG_VERSION ) $(NAME ) /standalone-chrome:$(MAJOR ) .$(MINOR )
254
+ docker tag $(NAME ) /standalone-edge:$(TAG_VERSION ) $(NAME ) /standalone-edge:$(MAJOR ) .$(MINOR )
228
255
docker tag $(NAME ) /standalone-firefox:$(TAG_VERSION ) $(NAME ) /standalone-firefox:$(MAJOR ) .$(MINOR )
229
256
docker tag $(NAME ) /standalone-opera:$(TAG_VERSION ) $(NAME ) /standalone-opera:$(MAJOR ) .$(MINOR )
230
257
docker tag $(NAME ) /standalone-docker:$(TAG_VERSION ) $(NAME ) /standalone-docker:$(MAJOR ) .$(MINOR )
@@ -237,10 +264,12 @@ tag_major_minor:
237
264
docker tag $(NAME ) /event-bus:$(TAG_VERSION ) $(NAME ) /event-bus:$(MAJOR_MINOR_PATCH )
238
265
docker tag $(NAME ) /node-base:$(TAG_VERSION ) $(NAME ) /node-base:$(MAJOR_MINOR_PATCH )
239
266
docker tag $(NAME ) /node-chrome:$(TAG_VERSION ) $(NAME ) /node-chrome:$(MAJOR_MINOR_PATCH )
267
+ docker tag $(NAME ) /node-edge:$(TAG_VERSION ) $(NAME ) /node-edge:$(MAJOR_MINOR_PATCH )
240
268
docker tag $(NAME ) /node-firefox:$(TAG_VERSION ) $(NAME ) /node-firefox:$(MAJOR_MINOR_PATCH )
241
269
docker tag $(NAME ) /node-opera:$(TAG_VERSION ) $(NAME ) /node-opera:$(MAJOR_MINOR_PATCH )
242
270
docker tag $(NAME ) /node-docker:$(TAG_VERSION ) $(NAME ) /node-docker:$(MAJOR_MINOR_PATCH )
243
271
docker tag $(NAME ) /standalone-chrome:$(TAG_VERSION ) $(NAME ) /standalone-chrome:$(MAJOR_MINOR_PATCH )
272
+ docker tag $(NAME ) /standalone-edge:$(TAG_VERSION ) $(NAME ) /standalone-edge:$(MAJOR_MINOR_PATCH )
244
273
docker tag $(NAME ) /standalone-firefox:$(TAG_VERSION ) $(NAME ) /standalone-firefox:$(MAJOR_MINOR_PATCH )
245
274
docker tag $(NAME ) /standalone-opera:$(TAG_VERSION ) $(NAME ) /standalone-opera:$(MAJOR_MINOR_PATCH )
246
275
docker tag $(NAME ) /standalone-docker:$(TAG_VERSION ) $(NAME ) /standalone-docker:$(MAJOR_MINOR_PATCH )
@@ -255,10 +284,12 @@ release: tag_major_minor
255
284
@if ! docker images $(NAME ) /event-bus | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /event-bus version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
256
285
@if ! docker images $(NAME ) /node-base | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /node-base version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
257
286
@if ! docker images $(NAME ) /node-chrome | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /node-chrome version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
287
+ @if ! docker images $(NAME ) /node-edge | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /node-edge version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
258
288
@if ! docker images $(NAME ) /node-firefox | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /node-firefox version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
259
289
@if ! docker images $(NAME ) /node-opera | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /node-opera version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
260
290
@if ! docker images $(NAME ) /node-docker | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /node-docker version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
261
291
@if ! docker images $(NAME ) /standalone-chrome | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /standalone-chrome version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
292
+ @if ! docker images $(NAME ) /standalone-edge | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /standalone-edge version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
262
293
@if ! docker images $(NAME ) /standalone-firefox | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /standalone-firefox version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
263
294
@if ! docker images $(NAME ) /standalone-opera | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /standalone-opera version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
264
295
@if ! docker images $(NAME ) /standalone-docker | awk ' { print $$2 }' | grep -q -F $(TAG_VERSION ) ; then echo " $( NAME) /standalone-docker version $( TAG_VERSION) is not yet built. Please run 'make build'" ; false ; fi
@@ -271,10 +302,12 @@ release: tag_major_minor
271
302
docker push $(NAME ) /event-bus:$(TAG_VERSION )
272
303
docker push $(NAME ) /node-base:$(TAG_VERSION )
273
304
docker push $(NAME ) /node-chrome:$(TAG_VERSION )
305
+ docker push $(NAME ) /node-edge:$(TAG_VERSION )
274
306
docker push $(NAME ) /node-firefox:$(TAG_VERSION )
275
307
docker push $(NAME ) /node-opera:$(TAG_VERSION )
276
308
docker push $(NAME ) /node-docker:$(TAG_VERSION )
277
309
docker push $(NAME ) /standalone-chrome:$(TAG_VERSION )
310
+ docker push $(NAME ) /standalone-edge:$(TAG_VERSION )
278
311
docker push $(NAME ) /standalone-firefox:$(TAG_VERSION )
279
312
docker push $(NAME ) /standalone-opera:$(TAG_VERSION )
280
313
docker push $(NAME ) /standalone-docker:$(TAG_VERSION )
@@ -287,10 +320,12 @@ release: tag_major_minor
287
320
docker push $(NAME ) /event-bus:$(MAJOR )
288
321
docker push $(NAME ) /node-base:$(MAJOR )
289
322
docker push $(NAME ) /node-chrome:$(MAJOR )
323
+ docker push $(NAME ) /node-edge:$(MAJOR )
290
324
docker push $(NAME ) /node-firefox:$(MAJOR )
291
325
docker push $(NAME ) /node-opera:$(MAJOR )
292
326
docker push $(NAME ) /node-docker:$(MAJOR )
293
327
docker push $(NAME ) /standalone-chrome:$(MAJOR )
328
+ docker push $(NAME ) /standalone-edge:$(MAJOR )
294
329
docker push $(NAME ) /standalone-firefox:$(MAJOR )
295
330
docker push $(NAME ) /standalone-opera:$(MAJOR )
296
331
docker push $(NAME ) /standalone-docker:$(MAJOR )
@@ -303,10 +338,12 @@ release: tag_major_minor
303
338
docker push $(NAME ) /event-bus:$(MAJOR ) .$(MINOR )
304
339
docker push $(NAME ) /node-base:$(MAJOR ) .$(MINOR )
305
340
docker push $(NAME ) /node-chrome:$(MAJOR ) .$(MINOR )
341
+ docker push $(NAME ) /node-edge:$(MAJOR ) .$(MINOR )
306
342
docker push $(NAME ) /node-firefox:$(MAJOR ) .$(MINOR )
307
343
docker push $(NAME ) /node-opera:$(MAJOR ) .$(MINOR )
308
344
docker push $(NAME ) /node-docker:$(MAJOR ) .$(MINOR )
309
345
docker push $(NAME ) /standalone-chrome:$(MAJOR ) .$(MINOR )
346
+ docker push $(NAME ) /standalone-edge:$(MAJOR ) .$(MINOR )
310
347
docker push $(NAME ) /standalone-firefox:$(MAJOR ) .$(MINOR )
311
348
docker push $(NAME ) /standalone-opera:$(MAJOR ) .$(MINOR )
312
349
docker push $(NAME ) /standalone-docker:$(MAJOR ) .$(MINOR )
@@ -319,10 +356,12 @@ release: tag_major_minor
319
356
docker push $(NAME ) /event-bus:$(MAJOR_MINOR_PATCH )
320
357
docker push $(NAME ) /node-base:$(MAJOR_MINOR_PATCH )
321
358
docker push $(NAME ) /node-chrome:$(MAJOR_MINOR_PATCH )
359
+ docker push $(NAME ) /node-edge:$(MAJOR_MINOR_PATCH )
322
360
docker push $(NAME ) /node-firefox:$(MAJOR_MINOR_PATCH )
323
361
docker push $(NAME ) /node-opera:$(MAJOR_MINOR_PATCH )
324
362
docker push $(NAME ) /node-docker:$(MAJOR_MINOR_PATCH )
325
363
docker push $(NAME ) /standalone-chrome:$(MAJOR_MINOR_PATCH )
364
+ docker push $(NAME ) /standalone-edge:$(MAJOR_MINOR_PATCH )
326
365
docker push $(NAME ) /standalone-firefox:$(MAJOR_MINOR_PATCH )
327
366
docker push $(NAME ) /standalone-opera:$(MAJOR_MINOR_PATCH )
328
367
docker push $(NAME ) /standalone-docker:$(MAJOR_MINOR_PATCH )
@@ -332,9 +371,11 @@ release: tag_major_minor
332
371
# video: this should be moved to release_latest when Selenium 4 is released
333
372
334
373
test : test_chrome \
374
+ test_edge \
335
375
test_firefox \
336
376
test_opera \
337
377
test_chrome_standalone \
378
+ test_edge_standalone \
338
379
test_firefox_standalone \
339
380
test_opera_standalone
340
381
@@ -345,6 +386,12 @@ test_chrome:
345
386
test_chrome_standalone :
346
387
VERSION=$(TAG_VERSION ) NAMESPACE=$(NAMESPACE ) ./tests/bootstrap.sh StandaloneChrome
347
388
389
+ test_edge :
390
+ VERSION=$(TAG_VERSION ) NAMESPACE=$(NAMESPACE ) ./tests/bootstrap.sh NodeEdge
391
+
392
+ test_edge_standalone :
393
+ VERSION=$(TAG_VERSION ) NAMESPACE=$(NAMESPACE ) ./tests/bootstrap.sh StandaloneEdge
394
+
348
395
test_firefox :
349
396
VERSION=$(TAG_VERSION ) NAMESPACE=$(NAMESPACE ) ./tests/bootstrap.sh NodeFirefox
350
397
@@ -359,9 +406,9 @@ test_opera_standalone:
359
406
360
407
# This should run on its own CI job. There is no need to combine it with the other tests.
361
408
# Its main purpose is to check that a video file was generated.
362
- test_video : video hub chrome firefox opera
409
+ test_video : video hub chrome firefox opera edge
363
410
# Running a few tests with docker-compose to generate the videos
364
- for node in NodeChrome NodeFirefox NodeOpera ; do \
411
+ for node in NodeChrome NodeEdge NodeFirefox NodeOpera ; do \
365
412
cd ./tests || true ; \
366
413
echo VIDEO_TAG=$(FFMPEG_TAG_VERSION ) -$(BUILD_DATE ) > .env ; \
367
414
echo TAG=$(TAG_VERSION ) >> .env ; \
@@ -370,6 +417,10 @@ test_video: video hub chrome firefox opera
370
417
echo BROWSER=chrome >> .env ; \
371
418
echo VIDEO_FILE_NAME=chrome_video.mp4 >> .env ; \
372
419
fi ; \
420
+ if [ $$ node = " NodeEdge" ] ; then \
421
+ echo BROWSER=edge >> .env ; \
422
+ echo VIDEO_FILE_NAME=edge_video.mp4 >> .env ; \
423
+ fi ; \
373
424
if [ $$ node = " NodeFirefox" ] ; then \
374
425
echo BROWSER=firefox >> .env ; \
375
426
echo VIDEO_FILE_NAME=firefox_video.mp4 >> .env ; \
@@ -383,15 +434,17 @@ test_video: video hub chrome firefox opera
383
434
# Using ffmpeg to verify file integrity
384
435
# https://superuser.com/questions/100288/how-can-i-check-the-integrity-of-a-video-file-avi-mpeg-mp4
385
436
docker run -v $$(pwd ) :$$(pwd ) -w $$(pwd ) jrottenberg/ffmpeg:4.3.1-ubuntu2004 -v error -i ./tests/videos/chrome_video.mp4 -f null - 2> error.log
437
+ docker run -v $$(pwd ) :$$(pwd ) -w $$(pwd ) jrottenberg/ffmpeg:4.3.1-ubuntu2004 -v error -i ./tests/videos/edge_video.mp4 -f null - 2> error.log
386
438
docker run -v $$(pwd ) :$$(pwd ) -w $$(pwd ) jrottenberg/ffmpeg:4.3.1-ubuntu2004 -v error -i ./tests/videos/firefox_video.mp4 -f null - 2> error.log
387
439
docker run -v $$(pwd ) :$$(pwd ) -w $$(pwd ) jrottenberg/ffmpeg:4.3.1-ubuntu2004 -v error -i ./tests/videos/opera_video.mp4 -f null - 2> error.log
388
440
389
441
.PHONY : \
390
442
all \
391
443
base \
392
444
build \
393
- chrome \
394
445
ci \
446
+ chrome \
447
+ edge \
395
448
firefox \
396
449
opera \
397
450
docker \
@@ -404,10 +457,12 @@ test_video: video hub chrome firefox opera
404
457
generate_event_bus \
405
458
generate_node_base \
406
459
generate_chrome \
460
+ generate_edge \
407
461
generate_firefox \
408
462
generate_opera \
409
463
generate_docker \
410
464
generate_standalone_chrome \
465
+ generate_standalone_edge \
411
466
generate_standalone_firefox \
412
467
generate_standalone_opera \
413
468
generate_standalone_docker \
@@ -420,6 +475,7 @@ test_video: video hub chrome firefox opera
420
475
node_base \
421
476
release \
422
477
standalone_chrome \
478
+ standalone_edge \
423
479
standalone_firefox \
424
480
standalone_opera \
425
481
standalone_docker \
0 commit comments