Skip to content

Commit 519f38a

Browse files
diemoldiemol
authored
Remove Opera (#1282)
1 parent d2f09e8 commit 519f38a

22 files changed

+9
-443
lines changed

‎.github/workflows/test-video.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,4 @@ jobs:
5252
uses: actions/upload-artifact@v2
5353
with:
5454
name: firefox_video
55-
path: ./tests/videos/firefox_video.mp4
56-
- name: Upload recorded Opera video
57-
uses: actions/upload-artifact@v2
58-
with:
59-
name: opera_video
60-
path: ./tests/videos/opera_video.mp4
55+
path: ./tests/videos/firefox_video.mp4

‎Makefile

Lines changed: 4 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ all: hub \
2121
chrome \
2222
edge \
2323
firefox \
24-
opera \
2524
docker \
2625
standalone_chrome \
2726
standalone_edge \
2827
standalone_firefox \
29-
standalone_opera \
3028
standalone_docker \
3129
video
3230

@@ -41,12 +39,10 @@ generate_all: \
4139
generate_chrome \
4240
generate_edge \
4341
generate_firefox \
44-
generate_opera \
4542
generate_docker \
4643
generate_standalone_firefox \
4744
generate_standalone_chrome \
4845
generate_standalone_edge \
49-
generate_standalone_opera \
5046
generate_standalone_docker
5147

5248
build: all
@@ -116,12 +112,6 @@ generate_firefox:
116112
firefox: node_base generate_firefox
117113
cd ./NodeFirefox && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox:$(TAG_VERSION) .
118114

119-
generate_opera:
120-
cd ./NodeOpera && ./generate.sh $(TAG_VERSION) $(NAMESPACE) $(AUTHORS)
121-
122-
opera: node_base generate_opera
123-
cd ./NodeOpera && docker build $(BUILD_ARGS) -t $(NAME)/node-opera:$(TAG_VERSION) .
124-
125115
generate_docker:
126116
cd ./NodeDocker && ./generate.sh $(TAG_VERSION) $(NAMESPACE) $(AUTHORS)
127117

@@ -152,19 +142,13 @@ generate_standalone_edge:
152142
standalone_edge: edge generate_standalone_edge
153143
cd ./StandaloneEdge && docker build $(BUILD_ARGS) -t $(NAME)/standalone-edge:$(TAG_VERSION) .
154144

155-
generate_standalone_opera:
156-
cd ./Standalone && ./generate.sh StandaloneOpera node-opera $(TAG_VERSION) $(NAMESPACE) $(AUTHORS)
157-
158-
standalone_opera: opera generate_standalone_opera
159-
cd ./StandaloneOpera && docker build $(BUILD_ARGS) -t $(NAME)/standalone-opera:$(TAG_VERSION) .
160-
161145
video:
162146
cd ./Video && docker build $(BUILD_ARGS) -t $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) .
163147

164148

165149
# https://github.com/SeleniumHQ/docker-selenium/issues/992
166150
# Additional tags for browser images
167-
tag_and_push_browser_images: tag_and_push_chrome_images tag_and_push_firefox_images tag_and_push_opera_images tag_and_push_edge_images
151+
tag_and_push_browser_images: tag_and_push_chrome_images tag_and_push_firefox_images tag_and_push_edge_images
168152

169153
tag_and_push_chrome_images:
170154
./tag_and_push_browser_images.sh $(VERSION) $(BUILD_DATE) $(NAMESPACE) $(PUSH_IMAGE) chrome
@@ -175,9 +159,6 @@ tag_and_push_edge_images:
175159
tag_and_push_firefox_images:
176160
./tag_and_push_browser_images.sh $(VERSION) $(BUILD_DATE) $(NAMESPACE) $(PUSH_IMAGE) firefox
177161

178-
tag_and_push_opera_images:
179-
./tag_and_push_browser_images.sh $(VERSION) $(BUILD_DATE) $(NAMESPACE) $(PUSH_IMAGE) opera
180-
181162
tag_latest:
182163
docker tag $(NAME)/base:$(TAG_VERSION) $(NAME)/base:latest
183164
docker tag $(NAME)/hub:$(TAG_VERSION) $(NAME)/hub:latest
@@ -190,12 +171,10 @@ tag_latest:
190171
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:latest
191172
docker tag $(NAME)/node-edge:$(TAG_VERSION) $(NAME)/node-edge:latest
192173
docker tag $(NAME)/node-firefox:$(TAG_VERSION) $(NAME)/node-firefox:latest
193-
docker tag $(NAME)/node-opera:$(TAG_VERSION) $(NAME)/node-opera:latest
194174
docker tag $(NAME)/node-docker:$(TAG_VERSION) $(NAME)/node-docker:latest
195175
docker tag $(NAME)/standalone-chrome:$(TAG_VERSION) $(NAME)/standalone-chrome:latest
196176
docker tag $(NAME)/standalone-edge:$(TAG_VERSION) $(NAME)/standalone-edge:latest
197177
docker tag $(NAME)/standalone-firefox:$(TAG_VERSION) $(NAME)/standalone-firefox:latest
198-
docker tag $(NAME)/standalone-opera:$(TAG_VERSION) $(NAME)/standalone-opera:latest
199178
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:latest
200179

201180
release_latest:
@@ -210,12 +189,10 @@ release_latest:
210189
docker push $(NAME)/node-chrome:latest
211190
docker push $(NAME)/node-edge:latest
212191
docker push $(NAME)/node-firefox:latest
213-
docker push $(NAME)/node-opera:latest
214192
docker push $(NAME)/node-docker:latest
215193
docker push $(NAME)/standalone-chrome:latest
216194
docker push $(NAME)/standalone-edge:latest
217195
docker push $(NAME)/standalone-firefox:latest
218-
docker push $(NAME)/standalone-opera:latest
219196
docker push $(NAME)/standalone-docker:latest
220197

221198
tag_major_minor:
@@ -230,12 +207,10 @@ tag_major_minor:
230207
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR)
231208
docker tag $(NAME)/node-edge:$(TAG_VERSION) $(NAME)/node-edge:$(MAJOR)
232209
docker tag $(NAME)/node-firefox:$(TAG_VERSION) $(NAME)/node-firefox:$(MAJOR)
233-
docker tag $(NAME)/node-opera:$(TAG_VERSION) $(NAME)/node-opera:$(MAJOR)
234210
docker tag $(NAME)/node-docker:$(TAG_VERSION) $(NAME)/node-docker:$(MAJOR)
235211
docker tag $(NAME)/standalone-chrome:$(TAG_VERSION) $(NAME)/standalone-chrome:$(MAJOR)
236212
docker tag $(NAME)/standalone-edge:$(TAG_VERSION) $(NAME)/standalone-edge:$(MAJOR)
237213
docker tag $(NAME)/standalone-firefox:$(TAG_VERSION) $(NAME)/standalone-firefox:$(MAJOR)
238-
docker tag $(NAME)/standalone-opera:$(TAG_VERSION) $(NAME)/standalone-opera:$(MAJOR)
239214
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:$(MAJOR)
240215
docker tag $(NAME)/base:$(TAG_VERSION) $(NAME)/base:$(MAJOR).$(MINOR)
241216
docker tag $(NAME)/hub:$(TAG_VERSION) $(NAME)/hub:$(MAJOR).$(MINOR)
@@ -248,12 +223,10 @@ tag_major_minor:
248223
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR).$(MINOR)
249224
docker tag $(NAME)/node-edge:$(TAG_VERSION) $(NAME)/node-edge:$(MAJOR).$(MINOR)
250225
docker tag $(NAME)/node-firefox:$(TAG_VERSION) $(NAME)/node-firefox:$(MAJOR).$(MINOR)
251-
docker tag $(NAME)/node-opera:$(TAG_VERSION) $(NAME)/node-opera:$(MAJOR).$(MINOR)
252226
docker tag $(NAME)/node-docker:$(TAG_VERSION) $(NAME)/node-docker:$(MAJOR).$(MINOR)
253227
docker tag $(NAME)/standalone-chrome:$(TAG_VERSION) $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
254228
docker tag $(NAME)/standalone-edge:$(TAG_VERSION) $(NAME)/standalone-edge:$(MAJOR).$(MINOR)
255229
docker tag $(NAME)/standalone-firefox:$(TAG_VERSION) $(NAME)/standalone-firefox:$(MAJOR).$(MINOR)
256-
docker tag $(NAME)/standalone-opera:$(TAG_VERSION) $(NAME)/standalone-opera:$(MAJOR).$(MINOR)
257230
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:$(MAJOR).$(MINOR)
258231
docker tag $(NAME)/base:$(TAG_VERSION) $(NAME)/base:$(MAJOR_MINOR_PATCH)
259232
docker tag $(NAME)/hub:$(TAG_VERSION) $(NAME)/hub:$(MAJOR_MINOR_PATCH)
@@ -266,12 +239,10 @@ tag_major_minor:
266239
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
267240
docker tag $(NAME)/node-edge:$(TAG_VERSION) $(NAME)/node-edge:$(MAJOR_MINOR_PATCH)
268241
docker tag $(NAME)/node-firefox:$(TAG_VERSION) $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
269-
docker tag $(NAME)/node-opera:$(TAG_VERSION) $(NAME)/node-opera:$(MAJOR_MINOR_PATCH)
270242
docker tag $(NAME)/node-docker:$(TAG_VERSION) $(NAME)/node-docker:$(MAJOR_MINOR_PATCH)
271243
docker tag $(NAME)/standalone-chrome:$(TAG_VERSION) $(NAME)/standalone-chrome:$(MAJOR_MINOR_PATCH)
272244
docker tag $(NAME)/standalone-edge:$(TAG_VERSION) $(NAME)/standalone-edge:$(MAJOR_MINOR_PATCH)
273245
docker tag $(NAME)/standalone-firefox:$(TAG_VERSION) $(NAME)/standalone-firefox:$(MAJOR_MINOR_PATCH)
274-
docker tag $(NAME)/standalone-opera:$(TAG_VERSION) $(NAME)/standalone-opera:$(MAJOR_MINOR_PATCH)
275246
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:$(MAJOR_MINOR_PATCH)
276247

277248
release: tag_major_minor
@@ -286,12 +257,10 @@ release: tag_major_minor
286257
@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
287258
@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
288259
@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
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
290260
@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
291261
@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
292262
@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
293263
@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
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
295264
@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
296265
docker push $(NAME)/base:$(TAG_VERSION)
297266
docker push $(NAME)/hub:$(TAG_VERSION)
@@ -304,12 +273,10 @@ release: tag_major_minor
304273
docker push $(NAME)/node-chrome:$(TAG_VERSION)
305274
docker push $(NAME)/node-edge:$(TAG_VERSION)
306275
docker push $(NAME)/node-firefox:$(TAG_VERSION)
307-
docker push $(NAME)/node-opera:$(TAG_VERSION)
308276
docker push $(NAME)/node-docker:$(TAG_VERSION)
309277
docker push $(NAME)/standalone-chrome:$(TAG_VERSION)
310278
docker push $(NAME)/standalone-edge:$(TAG_VERSION)
311279
docker push $(NAME)/standalone-firefox:$(TAG_VERSION)
312-
docker push $(NAME)/standalone-opera:$(TAG_VERSION)
313280
docker push $(NAME)/standalone-docker:$(TAG_VERSION)
314281
docker push $(NAME)/base:$(MAJOR)
315282
docker push $(NAME)/hub:$(MAJOR)
@@ -322,12 +289,10 @@ release: tag_major_minor
322289
docker push $(NAME)/node-chrome:$(MAJOR)
323290
docker push $(NAME)/node-edge:$(MAJOR)
324291
docker push $(NAME)/node-firefox:$(MAJOR)
325-
docker push $(NAME)/node-opera:$(MAJOR)
326292
docker push $(NAME)/node-docker:$(MAJOR)
327293
docker push $(NAME)/standalone-chrome:$(MAJOR)
328294
docker push $(NAME)/standalone-edge:$(MAJOR)
329295
docker push $(NAME)/standalone-firefox:$(MAJOR)
330-
docker push $(NAME)/standalone-opera:$(MAJOR)
331296
docker push $(NAME)/standalone-docker:$(MAJOR)
332297
docker push $(NAME)/base:$(MAJOR).$(MINOR)
333298
docker push $(NAME)/hub:$(MAJOR).$(MINOR)
@@ -340,12 +305,10 @@ release: tag_major_minor
340305
docker push $(NAME)/node-chrome:$(MAJOR).$(MINOR)
341306
docker push $(NAME)/node-edge:$(MAJOR).$(MINOR)
342307
docker push $(NAME)/node-firefox:$(MAJOR).$(MINOR)
343-
docker push $(NAME)/node-opera:$(MAJOR).$(MINOR)
344308
docker push $(NAME)/node-docker:$(MAJOR).$(MINOR)
345309
docker push $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
346310
docker push $(NAME)/standalone-edge:$(MAJOR).$(MINOR)
347311
docker push $(NAME)/standalone-firefox:$(MAJOR).$(MINOR)
348-
docker push $(NAME)/standalone-opera:$(MAJOR).$(MINOR)
349312
docker push $(NAME)/standalone-docker:$(MAJOR).$(MINOR)
350313
docker push $(NAME)/base:$(MAJOR_MINOR_PATCH)
351314
docker push $(NAME)/hub:$(MAJOR_MINOR_PATCH)
@@ -358,12 +321,10 @@ release: tag_major_minor
358321
docker push $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
359322
docker push $(NAME)/node-edge:$(MAJOR_MINOR_PATCH)
360323
docker push $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
361-
docker push $(NAME)/node-opera:$(MAJOR_MINOR_PATCH)
362324
docker push $(NAME)/node-docker:$(MAJOR_MINOR_PATCH)
363325
docker push $(NAME)/standalone-chrome:$(MAJOR_MINOR_PATCH)
364326
docker push $(NAME)/standalone-edge:$(MAJOR_MINOR_PATCH)
365327
docker push $(NAME)/standalone-firefox:$(MAJOR_MINOR_PATCH)
366-
docker push $(NAME)/standalone-opera:$(MAJOR_MINOR_PATCH)
367328
docker push $(NAME)/standalone-docker:$(MAJOR_MINOR_PATCH)
368329
docker push $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE)
369330
docker tag $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) $(NAME)/video:latest
@@ -372,10 +333,8 @@ release: tag_major_minor
372333

373334
test: test_chrome \
374335
test_firefox \
375-
test_opera \
376336
test_chrome_standalone \
377-
test_firefox_standalone \
378-
test_opera_standalone
337+
test_firefox_standalone
379338

380339

381340
test_chrome:
@@ -396,17 +355,11 @@ test_firefox:
396355
test_firefox_standalone:
397356
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
398357

399-
test_opera:
400-
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeOpera
401-
402-
test_opera_standalone:
403-
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneOpera
404-
405358
# This should run on its own CI job. There is no need to combine it with the other tests.
406359
# Its main purpose is to check that a video file was generated.
407-
test_video: video hub chrome firefox opera edge
360+
test_video: video hub chrome firefox edge
408361
# Running a few tests with docker-compose to generate the videos
409-
for node in NodeChrome NodeFirefox NodeOpera ; do \
362+
for node in NodeChrome NodeFirefox ; do \
410363
cd ./tests || true ; \
411364
echo VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) > .env ; \
412365
echo TAG=$(TAG_VERSION) >> .env ; \
@@ -423,17 +376,12 @@ test_video: video hub chrome firefox opera edge
423376
echo BROWSER=firefox >> .env ; \
424377
echo VIDEO_FILE_NAME=firefox_video.mp4 >> .env ; \
425378
fi ; \
426-
if [ $$node = "NodeOpera" ] ; then \
427-
echo BROWSER=opera >> .env ; \
428-
echo VIDEO_FILE_NAME=opera_video.mp4 >> .env ; \
429-
fi ; \
430379
docker-compose -f docker-compose-v3-test-video.yml up --abort-on-container-exit --build ; \
431380
done
432381
# Using ffmpeg to verify file integrity
433382
# https://superuser.com/questions/100288/how-can-i-check-the-integrity-of-a-video-file-avi-mpeg-mp4
434383
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
435384
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
436-
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
437385

438386
.PHONY: \
439387
all \
@@ -443,7 +391,6 @@ test_video: video hub chrome firefox opera edge
443391
chrome \
444392
edge \
445393
firefox \
446-
opera \
447394
docker \
448395
generate_all \
449396
generate_hub \
@@ -456,12 +403,10 @@ test_video: video hub chrome firefox opera edge
456403
generate_chrome \
457404
generate_edge \
458405
generate_firefox \
459-
generate_opera \
460406
generate_docker \
461407
generate_standalone_chrome \
462408
generate_standalone_edge \
463409
generate_standalone_firefox \
464-
generate_standalone_opera \
465410
generate_standalone_docker \
466411
hub \
467412
distributor \
@@ -474,7 +419,6 @@ test_video: video hub chrome firefox opera edge
474419
standalone_chrome \
475420
standalone_edge \
476421
standalone_firefox \
477-
standalone_opera \
478422
standalone_docker \
479423
tag_latest \
480424
tag_and_push_browser_images \

‎NodeBase/start-xvfb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ if [ "${START_XVFB}" = true ] ; then
1414
--server-args="-screen 0 ${GEOMETRY} -fbdir /var/tmp -dpi ${SCREEN_DPI} -listen tcp -noreset -ac +extension RANDR" \
1515
/usr/bin/fluxbox -display ${DISPLAY}
1616
else
17-
echo "Xvfb and Fluxbox won't start. Chrome/Firefox/Opera can only run in headless mode. Remember to set the 'headless' flag in your test."
17+
echo "Xvfb and Fluxbox won't start. Chrome/Firefox/Node can only run in headless mode. Remember to set the 'headless' flag in your test."
1818
fi

‎NodeDocker/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
configs = [
55
"selenium/standalone-firefox:4.0.0-beta-3-20210426", "{\"browserName\": \"firefox\"}",
66
"selenium/standalone-chrome:4.0.0-beta-3-20210426", "{\"browserName\": \"chrome\"}",
7-
"selenium/standalone-opera:4.0.0-beta-3-20210426", "{\"browserName\": \"opera\"}",
87
"selenium/standalone-edge:4.0.0-beta-3-20210426", "{\"browserName\": \"MicrosoftEdge\"}"
98
]
109

‎NodeOpera/Dockerfile

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)