Skip to content

Commit 9353a18

Browse files
diemoldiemol
authored
Fix queue component name (#1290) [deploy][prerelease]
1 parent 816024c commit 9353a18

12 files changed

+89
-89
lines changed

‎Distributor/start-selenium-grid-distributor.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ if [[ -z "${SE_SESSIONS_MAP_PORT}" ]]; then
3030
exit 1
3131
fi
3232

33-
if [[ -z "${SE_SESSION_QUEUER_HOST}" ]]; then
34-
echo "SE_SESSION_QUEUER_HOST not set, exiting!" 1>&2
33+
if [[ -z "${SE_SESSION_QUEUE_HOST}" ]]; then
34+
echo "SE_SESSION_QUEUE_HOST not set, exiting!" 1>&2
3535
exit 1
3636
fi
3737

38-
if [[ -z "${SE_SESSION_QUEUER_PORT}" ]]; then
39-
echo "SE_SESSION_QUEUER_PORT not set, exiting!" 1>&2
38+
if [[ -z "${SE_SESSION_QUEUE_PORT}" ]]; then
39+
echo "SE_SESSION_QUEUE_PORT not set, exiting!" 1>&2
4040
exit 1
4141
fi
4242

@@ -57,7 +57,7 @@ fi
5757

5858
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar distributor \
5959
--sessions-host "${SE_SESSIONS_MAP_HOST}" --sessions-port "${SE_SESSIONS_MAP_PORT}" \
60-
--sessionqueuer-host "${SE_SESSION_QUEUER_HOST}" --sessionqueuer-port "${SE_SESSION_QUEUER_PORT}" \
60+
--sessionqueue-host "${SE_SESSION_QUEUE_HOST}" --sessionqueue-port "${SE_SESSION_QUEUE_PORT}" \
6161
--publish-events tcp://"${SE_EVENT_BUS_HOST}":"${SE_EVENT_BUS_PUBLISH_PORT}" \
6262
--subscribe-events tcp://"${SE_EVENT_BUS_HOST}":"${SE_EVENT_BUS_SUBSCRIBE_PORT}" \
6363
--bind-bus false \

‎Makefile‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ all: hub \
1616
distributor \
1717
router \
1818
sessions \
19-
sessionqueuer \
19+
sessionqueue \
2020
event_bus \
2121
chrome \
2222
edge \
@@ -33,7 +33,7 @@ generate_all: \
3333
generate_distributor \
3434
generate_router \
3535
generate_sessions \
36-
generate_sessionqueuer \
36+
generate_sessionqueue \
3737
generate_event_bus \
3838
generate_node_base \
3939
generate_chrome \
@@ -76,11 +76,11 @@ generate_sessions:
7676
sessions: base generate_sessions
7777
cd ./Sessions && docker build $(BUILD_ARGS) -t $(NAME)/sessions:$(TAG_VERSION) .
7878

79-
generate_sessionqueuer:
80-
cd ./SessionQueuer && ./generate.sh $(TAG_VERSION) $(NAMESPACE) $(AUTHORS)
79+
generate_sessionqueue:
80+
cd ./SessionQueue && ./generate.sh $(TAG_VERSION) $(NAMESPACE) $(AUTHORS)
8181

82-
sessionqueuer: base generate_sessionqueuer
83-
cd ./SessionQueuer && docker build $(BUILD_ARGS) -t $(NAME)/session-queuer:$(TAG_VERSION) .
82+
sessionqueue: base generate_sessionqueue
83+
cd ./SessionQueue && docker build $(BUILD_ARGS) -t $(NAME)/session-queue:$(TAG_VERSION) .
8484

8585
generate_event_bus:
8686
cd ./EventBus && ./generate.sh $(TAG_VERSION) $(NAMESPACE) $(AUTHORS)
@@ -165,7 +165,7 @@ tag_latest:
165165
docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:latest
166166
docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:latest
167167
docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:latest
168-
docker tag $(NAME)/session-queuer:$(TAG_VERSION) $(NAME)/session-queuer:latest
168+
docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:latest
169169
docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:latest
170170
docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:latest
171171
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:latest
@@ -183,7 +183,7 @@ release_latest:
183183
docker push $(NAME)/distributor:latest
184184
docker push $(NAME)/router:latest
185185
docker push $(NAME)/sessions:latest
186-
docker push $(NAME)/session-queuer:latest
186+
docker push $(NAME)/session-queue:latest
187187
docker push $(NAME)/event-bus:latest
188188
docker push $(NAME)/node-base:latest
189189
docker push $(NAME)/node-chrome:latest
@@ -201,7 +201,7 @@ tag_major_minor:
201201
docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:$(MAJOR)
202202
docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:$(MAJOR)
203203
docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:$(MAJOR)
204-
docker tag $(NAME)/session-queuer:$(TAG_VERSION) $(NAME)/session-queuer:$(MAJOR)
204+
docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:$(MAJOR)
205205
docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:$(MAJOR)
206206
docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:$(MAJOR)
207207
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR)
@@ -217,7 +217,7 @@ tag_major_minor:
217217
docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:$(MAJOR).$(MINOR)
218218
docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:$(MAJOR).$(MINOR)
219219
docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:$(MAJOR).$(MINOR)
220-
docker tag $(NAME)/session-queuer:$(TAG_VERSION) $(NAME)/session-queuer:$(MAJOR).$(MINOR)
220+
docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:$(MAJOR).$(MINOR)
221221
docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:$(MAJOR).$(MINOR)
222222
docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:$(MAJOR).$(MINOR)
223223
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR).$(MINOR)
@@ -233,7 +233,7 @@ tag_major_minor:
233233
docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:$(MAJOR_MINOR_PATCH)
234234
docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:$(MAJOR_MINOR_PATCH)
235235
docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:$(MAJOR_MINOR_PATCH)
236-
docker tag $(NAME)/session-queuer:$(TAG_VERSION) $(NAME)/session-queuer:$(MAJOR_MINOR_PATCH)
236+
docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:$(MAJOR_MINOR_PATCH)
237237
docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:$(MAJOR_MINOR_PATCH)
238238
docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
239239
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
@@ -251,7 +251,7 @@ release: tag_major_minor
251251
@if ! docker images $(NAME)/distributor | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/distributor version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
252252
@if ! docker images $(NAME)/router | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/router version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
253253
@if ! docker images $(NAME)/sessions | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/sessions version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
254-
@if ! docker images $(NAME)/session-queuer | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/session-queuer version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
254+
@if ! docker images $(NAME)/session-queue | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/session-queue version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
255255
@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
256256
@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
257257
@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
@@ -267,7 +267,7 @@ release: tag_major_minor
267267
docker push $(NAME)/distributor:$(TAG_VERSION)
268268
docker push $(NAME)/router:$(TAG_VERSION)
269269
docker push $(NAME)/sessions:$(TAG_VERSION)
270-
docker push $(NAME)/session-queuer:$(TAG_VERSION)
270+
docker push $(NAME)/session-queue:$(TAG_VERSION)
271271
docker push $(NAME)/event-bus:$(TAG_VERSION)
272272
docker push $(NAME)/node-base:$(TAG_VERSION)
273273
docker push $(NAME)/node-chrome:$(TAG_VERSION)
@@ -283,7 +283,7 @@ release: tag_major_minor
283283
docker push $(NAME)/distributor:$(MAJOR)
284284
docker push $(NAME)/router:$(MAJOR)
285285
docker push $(NAME)/sessions:$(MAJOR)
286-
docker push $(NAME)/session-queuer:$(MAJOR)
286+
docker push $(NAME)/session-queue:$(MAJOR)
287287
docker push $(NAME)/event-bus:$(MAJOR)
288288
docker push $(NAME)/node-base:$(MAJOR)
289289
docker push $(NAME)/node-chrome:$(MAJOR)
@@ -299,7 +299,7 @@ release: tag_major_minor
299299
docker push $(NAME)/distributor:$(MAJOR).$(MINOR)
300300
docker push $(NAME)/router:$(MAJOR).$(MINOR)
301301
docker push $(NAME)/sessions:$(MAJOR).$(MINOR)
302-
docker push $(NAME)/session-queuer:$(MAJOR).$(MINOR)
302+
docker push $(NAME)/session-queue:$(MAJOR).$(MINOR)
303303
docker push $(NAME)/event-bus:$(MAJOR).$(MINOR)
304304
docker push $(NAME)/node-base:$(MAJOR).$(MINOR)
305305
docker push $(NAME)/node-chrome:$(MAJOR).$(MINOR)
@@ -315,7 +315,7 @@ release: tag_major_minor
315315
docker push $(NAME)/distributor:$(MAJOR_MINOR_PATCH)
316316
docker push $(NAME)/router:$(MAJOR_MINOR_PATCH)
317317
docker push $(NAME)/sessions:$(MAJOR_MINOR_PATCH)
318-
docker push $(NAME)/session-queuer:$(MAJOR_MINOR_PATCH)
318+
docker push $(NAME)/session-queue:$(MAJOR_MINOR_PATCH)
319319
docker push $(NAME)/event-bus:$(MAJOR_MINOR_PATCH)
320320
docker push $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
321321
docker push $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
@@ -397,7 +397,7 @@ test_video: video hub chrome firefox edge
397397
generate_distributor \
398398
generate_router \
399399
generate_sessions \
400-
generate_sessionqueuer \
400+
generate_sessionqueue \
401401
generate_event_bus \
402402
generate_node_base \
403403
generate_chrome \
@@ -412,7 +412,7 @@ test_video: video hub chrome firefox edge
412412
distributor \
413413
router \
414414
sessions \
415-
sessionqueuer \
415+
sessionqueue \
416416
event_bus \
417417
node_base \
418418
release \

‎Router/start-selenium-grid-router.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ if [[ -z "${SE_DISTRIBUTOR_PORT}" ]]; then
2525
exit 1
2626
fi
2727

28-
if [[ -z "${SE_SESSION_QUEUER_HOST}" ]]; then
29-
echo "SE_SESSION_QUEUER_HOST not set, exiting!" 1>&2
28+
if [[ -z "${SE_SESSION_QUEUE_HOST}" ]]; then
29+
echo "SE_SESSION_QUEUE_HOST not set, exiting!" 1>&2
3030
exit 1
3131
fi
3232

33-
if [[ -z "${SE_SESSION_QUEUER_PORT}" ]]; then
34-
echo "SE_SESSION_QUEUER_PORT not set, exiting!" 1>&2
33+
if [[ -z "${SE_SESSION_QUEUE_PORT}" ]]; then
34+
echo "SE_SESSION_QUEUE_PORT not set, exiting!" 1>&2
3535
exit 1
3636
fi
3737

@@ -52,7 +52,7 @@ fi
5252
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar router \
5353
--sessions-host "${SE_SESSIONS_MAP_HOST}" --sessions-port "${SE_SESSIONS_MAP_PORT}" \
5454
--distributor-host "${SE_DISTRIBUTOR_HOST}" --distributor-port "${SE_DISTRIBUTOR_PORT}" \
55-
--sessionqueuer-host "${SE_SESSION_QUEUER_HOST}" --sessionqueuer-port "${SE_SESSION_QUEUER_PORT}" \
55+
--sessionqueue-host "${SE_SESSION_QUEUE_HOST}" --sessionqueue-port "${SE_SESSION_QUEUE_PORT}" \
5656
--relax-checks true \
5757
${HOST_CONFIG} \
5858
${PORT_CONFIG} \

‎SessionQueuer/Dockerfile‎ renamed to ‎SessionQueue/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ LABEL authors=SeleniumHQ
88
USER 1200
99

1010
#========================
11-
# Selenium SessionQueuer Configuration
11+
# Selenium SessionQueue Configuration
1212
#========================
1313

1414
EXPOSE 5559
1515

16-
COPY start-selenium-grid-session-queuer.sh \
16+
COPY start-selenium-grid-session-queue.sh \
1717
/opt/bin/
1818

19-
COPY selenium-grid-session-queuer.conf /etc/supervisor/conf.d/
19+
COPY selenium-grid-session-queue.conf /etc/supervisor/conf.d/

‎SessionQueue/Dockerfile.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
USER 1200
2+
3+
#========================
4+
# Selenium SessionQueue Configuration
5+
#========================
6+
7+
EXPOSE 5559
8+
9+
COPY start-selenium-grid-session-queue.sh \
10+
/opt/bin/
11+
12+
COPY selenium-grid-session-queue.conf /etc/supervisor/conf.d/

‎SessionQueuer/generate.sh‎ renamed to ‎SessionQueue/generate.sh‎

File renamed without changes.

‎SessionQueuer/selenium-grid-session-queuer.conf‎ renamed to ‎SessionQueue/selenium-grid-session-queue.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
; Documentation of this file format -> http://supervisord.org/configuration.html
22

3-
[program:selenium-grid-session-queuer]
3+
[program:selenium-grid-session-queue]
44

55
priority=0
6-
command=/opt/bin/start-selenium-grid-session-queuer.sh
6+
command=/opt/bin/start-selenium-grid-session-queue.sh
77
autostart=true
88
autorestart=false
99
startsecs=0

‎SessionQueuer/start-selenium-grid-session-queuer.sh‎ renamed to ‎SessionQueue/start-selenium-grid-session-queue.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# set -e: exit asap if a command exits with a non-zero status
44
set -e
55

6-
echo "Starting Selenium Grid SessionQueuer..."
6+
echo "Starting Selenium Grid SessionQueue..."
77

88
if [[ -z "${SE_EVENT_BUS_HOST}" ]]; then
99
echo "SE_EVENT_BUS_HOST not set, exiting!" 1>&2
@@ -24,17 +24,17 @@ if [ ! -z "$SE_OPTS" ]; then
2424
echo "Appending Selenium options: ${SE_OPTS}"
2525
fi
2626

27-
if [ ! -z "$SE_SESSION_QUEUER_HOST" ]; then
28-
echo "Using SE_SESSION_QUEUER_HOST: ${SE_SESSION_QUEUER_HOST}"
29-
HOST_CONFIG="--host ${SE_SESSION_QUEUER_HOST}"
27+
if [ ! -z "$SE_SESSION_QUEUE_HOST" ]; then
28+
echo "Using SE_SESSION_QUEUE_HOST: ${SE_SESSION_QUEUE_HOST}"
29+
HOST_CONFIG="--host ${SE_SESSION_QUEUE_HOST}"
3030
fi
3131

32-
if [ ! -z "$SE_SESSION_QUEUER_PORT" ]; then
33-
echo "Using SE_SESSION_QUEUER_PORT: ${SE_SESSION_QUEUER_PORT}"
34-
PORT_CONFIG="--port ${SE_SESSION_QUEUER_PORT}"
32+
if [ ! -z "$SE_SESSION_QUEUE_PORT" ]; then
33+
echo "Using SE_SESSION_QUEUE_PORT: ${SE_SESSION_QUEUE_PORT}"
34+
PORT_CONFIG="--port ${SE_SESSION_QUEUE_PORT}"
3535
fi
3636

37-
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar sessionqueuer \
37+
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar sessionqueue \
3838
--publish-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_PUBLISH_PORT} \
3939
--subscribe-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_SUBSCRIBE_PORT} \
4040
${HOST_CONFIG} \

‎SessionQueuer/Dockerfile.txt‎

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

‎docker-compose-v3-full-grid-dev.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ services:
2727
- SE_EVENT_BUS_PUBLISH_PORT=4442
2828
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
2929

30-
selenium-session-queuer:
31-
image: selenium/session-queuer:4.0.0-beta-4-prerelease-20210513
30+
selenium-session-queue:
31+
image: selenium/session-queue:4.0.0-beta-4-prerelease-20210513
3232
volumes:
3333
- ./selenium_server_deploy.jar:/opt/selenium/selenium-server.jar
34-
container_name: selenium-session-queuer
34+
container_name: selenium-session-queue
3535
ports:
3636
- "5559:5559"
3737
depends_on:
@@ -51,15 +51,15 @@ services:
5151
depends_on:
5252
- selenium-event-bus
5353
- selenium-sessions
54-
- selenium-session-queuer
54+
- selenium-session-queue
5555
environment:
5656
- SE_EVENT_BUS_HOST=selenium-event-bus
5757
- SE_EVENT_BUS_PUBLISH_PORT=4442
5858
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
5959
- SE_SESSIONS_MAP_HOST=selenium-sessions
6060
- SE_SESSIONS_MAP_PORT=5556
61-
- SE_SESSION_QUEUER_HOST=selenium-session-queuer
62-
- SE_SESSION_QUEUER_PORT=5559
61+
- SE_SESSION_QUEUE_HOST=selenium-session-queue
62+
- SE_SESSION_QUEUE_PORT=5559
6363

6464
selenium-router:
6565
image: selenium/router:4.0.0-beta-4-prerelease-20210513
@@ -71,14 +71,14 @@ services:
7171
depends_on:
7272
- selenium-distributor
7373
- selenium-sessions
74-
- selenium-session-queuer
74+
- selenium-session-queue
7575
environment:
7676
- SE_DISTRIBUTOR_HOST=selenium-distributor
7777
- SE_DISTRIBUTOR_PORT=5553
7878
- SE_SESSIONS_MAP_HOST=selenium-sessions
7979
- SE_SESSIONS_MAP_PORT=5556
80-
- SE_SESSION_QUEUER_HOST=selenium-session-queuer
81-
- SE_SESSION_QUEUER_PORT=5559
80+
- SE_SESSION_QUEUE_HOST=selenium-session-queue
81+
- SE_SESSION_QUEUE_PORT=5559
8282

8383
chrome:
8484
image: selenium/node-chrome:4.0.0-beta-4-prerelease-20210513

0 commit comments

Comments
 (0)