2.53.1p: Update image id, digest & png [ci skip]

Author: elgalubot

.env

@@ -48,12 +48,13 @@ export proj ?= grid
 export PROJ_NAME ?= ${proj}
 export COMPOSE_PROJ_NAME ?= ${PROJ_NAME}
 # VNC viewer relative size, vncviewer -Scaling
-export SIZE ?= 40%
+export SIZE ?= 50%
 
 # Enable video recording
 export VIDEO ?= true
 
 # App name is the service name for the web app under test
+# export APP ?= zalando_uk
 export APP ?= mock
 export APP_NAME ?= ${APP}
 

CHANGELOG.md

@@ -7,6 +7,31 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## 2.53.1p
+ + Date: 2016-07-19
+ + Upgrade Ubuntu xenial to 20160713
+ + Chore: Start xterm with a random geometry to differentiate nodes
+ + Image tag details:
+  + Selenium: v2.53.1 (a36b8b1)
+  + Chrome stable:  51.0.2704.106
+  + Firefox stable: 47.0.1
+  + Chromedriver: 2.22.397932 (282ed7cf89cf0053b6542e0d0f039d4123bbb6ad)
+  + Java: Oracle Java 9-ea+126
+  + Timezone: Europe/Berlin
+  + FROM ubuntu:xenial-20160713
+  + Python: 2.7.12
+  + Sauce Connect 4.3.16, build 2396 39e807b
+  + BrowserStack Local version 5.7
+  + Tested on kernel dev host: 4.4.0-31-generic x86_64
+  + Tested on kernel CI  host: 3.19.0-33-generic x86_64
+  + Built at dev host with: Docker version 1.12.0-rc4, build e4a0dbc
+  + Built at CI  host with: Docker version 1.11.2, build b9f10c9
+  + Built at dev host with: Docker Compose version 1.8.0-rc2, build c72c966
+  + Built at CI  host with: Docker Compose version 1.7.1, build 0a9ab35
+  + Image size: 2.548 GB
+  + Digest: sha256:d6d2528cf56235ad8326f905e1b8c7aa1359c70a714a2b79c44e2a33fd7a37c4
+  + Image ID: sha256:52763c9c89237976c279e365d4e2613b5de13029de017c969efc8b62dad84d5a
+
 ## 2.53.1n
  + Date: 2016-07-18
  + Fix OSX seq: illegal option -- -

CONTRIBUTING.md

@@ -8,19 +8,19 @@ For pull requests or local commits:
     open ./images/grid_console.png #to verify the versions are correct
     git checkout ./images/grid_console.png && open ./videos/chrome/*.mkv
     travis lint #if you changed .travis.yml
-    git checkout -b tmp-2.53.1n #name your branch according to your changes
+    git checkout -b tmp-2.53.1p #name your branch according to your changes
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Fix OSX seq: illegal option -- -"
+    git commit -m "Start xterm with a random geometry to differentiate nodes"
     git tag -d latest #tag latest will be updated from TravisCI
-    git tag 2.53.1n && git push origin tmp-2.53.1n && git push --tags
+    git tag 2.53.1p && git push origin tmp-2.53.1p && git push --tags
 
 -- Wait for Travis to pass OK
 -- Make sure changes got merged into master by elgalubot
 
-    git checkout master && git pull && git branch -d tmp-2.53.1n && git push origin --delete tmp-2.53.1n
+    git checkout master && git pull && git branch -d tmp-2.53.1p && git push origin --delete tmp-2.53.1p
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- If Chrome version changed upload:
@@ -36,9 +36,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 2.53.1n && git push origin :2.53.1n
+    git tag -d 2.53.1p && git push origin :2.53.1p
     #git add ...
-    git commit --amend && git tag 2.53.1n && git push --force origin tmp-2.53.1n && git push --tags
+    git commit --amend && git tag 2.53.1p && git push --force origin tmp-2.53.1p && git push --tags
 
 ## Docker push from Travis CI
 Travis [steps](https://docs.travis-ci.com/user/docker/#Pushing-a-Docker-Image-to-a-Registry) involve `docker login` and docker credentials encryptions.

Dockerfile

@@ -3,9 +3,9 @@
 ###################################################
 #== Ubuntu xenial is 16.04, i.e. FROM ubuntu:16.04
 # search for more at https://registry.hub.docker.com/_/ubuntu/tags/manage/
-FROM ubuntu:xenial-20160706
+FROM ubuntu:xenial-20160713
 ENV UBUNTU_FLAVOR="xenial" \
-    UBUNTU_DATE="20160706"
+    UBUNTU_DATE="20160713"
 
 #== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
 # FROM ubuntu:wily-20151208
@@ -38,10 +38,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
     DEBCONF_NONINTERACTIVE_SEEN=true
 
 # http://askubuntu.com/a/235911/134645
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com \
-      3B4FE6ACC0B21F32 \
-      40976EAF437D05B5 \
-      2EA8F35793D8809A \
+RUN  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2EA8F35793D8809A \
+  && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 \
+  && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 \
   && apt-key update -qqy
 
 #========================

Makefile

@@ -98,9 +98,7 @@ pull:
 	@# Only pull for end users, not CI servers or repo owners
 	@if [ "${TESTING_MAKE}" != "true" ]; then \
 	  echo "Pulling latest version of docker-selenium..." ; \
-	  docker pull elgalu/selenium:${DOCKER_SELENIUM_TAG} \
-	    > mk/docker-pull.log ; \
-	  tail -n 4 mk/docker-pull.log ; \
+	  docker pull elgalu/selenium:${DOCKER_SELENIUM_TAG} ; \
 	fi
 
 warn_vncviewer:
@@ -224,16 +222,22 @@ videos: gather_videos_chrome gather_videos_firefox
 # VNC open all. As of now only 4 are supported
 seeall: check_vncviewer
 	$(MAKE) see browser=chrome node=1
+	@sleep 0.3
 	$(MAKE) see browser=firefox node=1
+	@sleep 0.4
 	$(MAKE) see browser=chrome node=2
+	@sleep 0.5
 	$(MAKE) see browser=firefox node=2
 
 # Move them all. As of now only 4 are supported
 dock: check_wmctrl
-	sleep 1 #TODO Make active wait: http://stackoverflow.com/a/19441380/511069
+	@sleep 0.5 #TODO Make active wait: http://stackoverflow.com/a/19441380/511069
 	$(MAKE) move browser=chrome node=1
+	@sleep 0.7 #TODO Make active wait
 	$(MAKE) move browser=firefox node=1
+	@sleep 0.9 #TODO Make active wait
 	$(MAKE) move browser=chrome node=2
+	@sleep 1.1 #TODO Make active wait
 	$(MAKE) move browser=firefox node=2
 
 # Run self tests

docker-compose.yml

@@ -22,10 +22,16 @@ services:
     image: elgalu/selenium
     network_mode: "service:hub"
     shm_size: 1g
+    mem_limit: 2g
+    memswap_limit: 4g
+    # 90000 means 90%
+    # cpu_quota: 90000
     environment:
       - SELENIUM_HUB_PORT
       - VNC_FROM_PORT
       - VNC_TO_PORT
+      - SCREEN_WIDTH=1300
+      - SCREEN_HEIGHT=999
       - PICK_ALL_RANDMON_PORTS=true
       - VIDEO
       - GRID=false
@@ -35,10 +41,16 @@ services:
   firefox:
     image: elgalu/selenium
     network_mode: "service:hub"
+    mem_limit: 2g
+    memswap_limit: 4g
+    # 90000 means 90%
+    # cpu_quota: 90000
     environment:
       - SELENIUM_HUB_PORT
       - VNC_FROM_PORT
       - VNC_TO_PORT
+      - SCREEN_WIDTH=1300
+      - SCREEN_HEIGHT=999
       - PICK_ALL_RANDMON_PORTS=true
       - VIDEO
       - GRID=false
@@ -52,6 +64,13 @@ services:
     environment:
       - MOCK_SERVER_PORT=8080
 
+  # zalando_uk:
+  #   image: elgalu/uk_mock
+  #   network_mode: "service:hub"
+  #   tty: true
+  #   environment:
+  #     - MOCK_SERVER_PORT=8080
+
 #-- Notes --#
 # shm_size: 1g
 #  Fixes small 64 mb /dev/shm inside docker containers

docs/make.md

@@ -43,7 +43,7 @@ Gather the videos artifacts easily
 ### Cleanup
 When done, is convenient to shutdown all the containers.
 
-    make cleanup
+    make down
 
 ## Update
 Every now and then you will want to upgrade the script files [.env](../.env), [docker-compose.yml][], [mk/](../mk) and so on.

test/before_install_setup

@@ -22,5 +22,11 @@ else
 fi
 docker-compose --version || (echo "FATAL: No docker compose installed" && exit 1)
 
+# Git latest stable to avoid hang on `git merge travis-${TRAVIS_TAG}`
+# sudo add-apt-repository -y ppa:git-core/ppa
+# sudo apt-get -qyy update
+# sudo apt-get -qyy install git
+# git --version #=> 2.9.2
+
 # Notes:
 #  sudo -E or --preserve-env will preserve travis env vars like DOCKER_COMPOSE_VERSION

test/script_push

@@ -51,7 +51,9 @@ git_co_fetch_merge_stash() {
   git stash save || true
   git checkout -t github/master -b github/master
   echo "Will git merge into master"
-  git merge travis-${TRAVIS_TAG}
+  if ! timeout --foreground "30s" git merge travis-${TRAVIS_TAG}; then
+    echo "WARN: Timed out on git merge!" 1>&2
+  fi
   git stash pop || true
 }
 

xterm/bin/start-xterm.sh

@@ -85,8 +85,11 @@ else
 fi
 
 # Start a GUI xTerm to help debugging when VNC into the container
+# with a random geometry so we can differentiate multiple nodes
+GEOM1=$(python -c 'import random; print(random.randint(80,140))')
+GEOM2=$(python -c 'import random; print(random.randint(30,50))')
 x-terminal-emulator -ls  \
-  -geometry 120x40+10+10 \
+  -geometry ${GEOM1}x${GEOM2}+10+10 \
   -title "x-terminal-emulator" \
   &