@@ -138,13 +138,21 @@ check_wmctrl:
138138see : check_vncviewer
139139 ./mk/see.sh &
140140
141+ # Shortcut to VNC into Chrome
142+ seech :
143+ @$(MAKE ) -s see browser=chrome
144+
141145# Shortcut to VNC into Firefox
142146seeff :
143147 @$(MAKE ) -s see browser=firefox
144148
145- # Shortcut to VNC into Chrome
146- seech :
147- @$(MAKE ) -s see browser=chrome
149+ # Shortcut to VNC into RC Firefox
150+ seercff :
151+ @$(MAKE ) -s see browser=rc_firefox
152+
153+ # Shortcut to VNC into RC Chrome
154+ seercch :
155+ @$(MAKE ) -s see browser=rc_chrome
148156
149157env :
150158 env
@@ -166,6 +174,8 @@ down:
166174 @if [ " ${VIDEO} " = " true" ]; then \
167175 $(MAKE ) -s stop_videos_chrome ; \
168176 $(MAKE ) -s stop_videos_firefox ; \
177+ $(MAKE ) -s stop_videos_rc_chrome ; \
178+ $(MAKE ) -s stop_videos_rc_firefox ; \
169179 fi
170180 docker-compose -f ${COMPOSE_FILE} -p ${COMPOSE_PROJ_NAME} down \
171181 --remove-orphans
@@ -182,14 +192,20 @@ stop_videos_chrome:
182192stop_videos_firefox :
183193 @$(MAKE ) -s stop_videos browser=firefox tot_nodes=${firefox}
184194
195+ stop_videos_rc_chrome :
196+ @$(MAKE ) -s stop_videos browser=rc_chrome tot_nodes=${rc_chrome}
197+
198+ stop_videos_rc_firefox :
199+ @$(MAKE ) -s stop_videos browser=rc_firefox tot_nodes=${rc_firefox}
200+
185201scale :
186202 docker-compose -f ${COMPOSE_FILE} -p ${COMPOSE_PROJ_NAME} scale \
187- ${APP_NAME} =1 hub=1 chrome=${chrome} firefox=${firefox}
203+ ${APP_NAME} =1 hub=1 chrome=${chrome} firefox=${firefox} rc_chrome= ${rc_chrome} rc_firefox= ${rc_firefox}
188204 @$(MAKE ) -s wait chrome=${chrome} firefox=${firefox}
189205
190206compose : basic_reqs cleanup
191207 docker-compose -f ${COMPOSE_FILE} -p ${COMPOSE_PROJ_NAME} up -d
192- @$(MAKE ) -s scale chrome=${chrome} firefox=${firefox}
208+ @$(MAKE ) -s scale chrome=${chrome} firefox=${firefox} rc_chrome= ${rc_chrome} rc_firefox= ${rc_firefox}
193209
194210wait :
195211 ./mk/wait.sh
@@ -216,18 +232,24 @@ gather_videos_chrome:
216232gather_videos_firefox :
217233 @$(MAKE ) -s gather_videos browser=firefox tot_nodes=${firefox}
218234
235+ gather_videos_rc_chrome :
236+ @$(MAKE ) -s gather_videos browser=rc_chrome tot_nodes=${rc_chrome}
237+
238+ gather_videos_rc_firefox :
239+ @$(MAKE ) -s gather_videos browser=rc_firefox tot_nodes=${rc_firefox}
240+
219241# Gather video artifacts
220- videos : gather_videos_chrome gather_videos_firefox
242+ videos : gather_videos_chrome gather_videos_firefox gather_videos_rc_chrome gather_videos_rc_firefox
221243
222244# VNC open all. As of now only 4 are supported
223245seeall : check_vncviewer
224246 @$(MAKE ) -s see browser=chrome node=1
225247 @sleep 0.3
226248 @$(MAKE ) -s see browser=firefox node=1
227249 @sleep 0.4
228- @$(MAKE ) -s see browser=chrome node=2
229- @sleep 0.5
230- @$(MAKE ) -s see browser=firefox node=2
250+ @$(MAKE ) -s see browser=rc_chrome node=1
251+ @sleep 0.3
252+ @$(MAKE ) -s see browser=rc_firefox node=1
231253
232254# Move them all. As of now only 4 are supported
233255dock : check_wmctrl
@@ -236,9 +258,9 @@ dock: check_wmctrl
236258 @sleep 0.2 # TODO Make active wait
237259 @$(MAKE ) -s move browser=firefox node=1
238260 @sleep 0.2 # TODO Make active wait
239- @$(MAKE ) -s move browser=chrome node=2
261+ @$(MAKE ) -s move browser=rc_chrome node=1
240262 @sleep 0.2 # TODO Make active wait
241- @$(MAKE ) -s move browser=firefox node=2
263+ @$(MAKE ) -s move browser=rc_firefox node=1
242264
243265# Run self tests
244266test :
@@ -266,6 +288,8 @@ test:
266288 scale \
267289 seeff \
268290 seech \
291+ seercff \
292+ seercch \
269293 compose \
270294 wait \
271295 down \
0 commit comments