Upgrade Ubuntu xenial to 20160713

Author: elgalu

.travis.yml

@@ -78,8 +78,8 @@ install:
 script:
   - ./test/script_start
   - travis_retry ./test/script_scenario_make
-  # - travis_retry ./test/script_scenario_compose_1_1
-  # - travis_retry ./test/script_scenario_compose_N_N
+  - travis_retry ./test/script_scenario_compose_1_1
+  - travis_retry ./test/script_scenario_compose_N_N
   - ./test/script_end
 
 # cleanup though doesn't seem to be necessary in Travis infra

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.1o #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 "Start xterm with a random geometry to differentiate nodes"
     git tag -d latest #tag latest will be updated from TravisCI
-    git tag 2.53.1o && git push origin tmp-2.53.1o && 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.1o && git push origin --delete tmp-2.53.1o
+    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.1o && git push origin :2.53.1o
+    git tag -d 2.53.1p && git push origin :2.53.1p
     #git add ...
-    git commit --amend && git tag 2.53.1o && git push --force origin tmp-2.53.1o && 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.

Makefile

@@ -224,20 +224,20 @@ seeall: check_vncviewer
 	$(MAKE) see browser=chrome node=1
 	@sleep 0.3
 	$(MAKE) see browser=firefox node=1
-	@sleep 0.3
+	@sleep 0.4
 	$(MAKE) see browser=chrome node=2
-	@sleep 0.3
+	@sleep 0.5
 	$(MAKE) see browser=firefox node=2
 
 # Move them all. As of now only 4 are supported
 dock: check_wmctrl
 	@sleep 0.5 #TODO Make active wait: http://stackoverflow.com/a/19441380/511069
 	$(MAKE) move browser=chrome node=1
-	@sleep 0.3 #TODO Make active wait
+	@sleep 0.7 #TODO Make active wait
 	$(MAKE) move browser=firefox node=1
-	@sleep 0.5 #TODO Make active wait
+	@sleep 0.9 #TODO Make active wait
 	$(MAKE) move browser=chrome node=2
-	@sleep 0.7 #TODO Make active wait
+	@sleep 1.1 #TODO Make active wait
 	$(MAKE) move browser=firefox node=2
 
 # Run self tests

test/before_install_setup

@@ -23,10 +23,10 @@ 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
+# 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
 }