Use Selenium 3 via docker run -e USE_SELENIUM=3

elgalu · elgalu · commit 6bfb19a02a2e · 2016-10-05T15:52:52.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -42,7 +42,7 @@ matrix:
         - DOCKER_VERSION="stable"
           DOCKER_COMPOSE_VERSION="1.8.1"
           DOCKER_PUSH=true
-          DOCKER_PUSH_LATEST=false
+          DOCKER_PUSH_LATEST=true
     # Linux with docker:beta/older compose:beta/older
     - os: linux
       language: python
@@ -51,7 +51,7 @@ matrix:
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.12.2-rc1"
+        - DOCKER_VERSION="1.12.2-rc2"
           DOCKER_COMPOSE_VERSION="1.8.0"
     # Linux with docker:stable compose:beta/older
     - os: linux
@@ -71,7 +71,7 @@ matrix:
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.12.2-rc1"
+        - DOCKER_VERSION="1.12.2-rc2"
           DOCKER_COMPOSE_VERSION="1.8.1"
     # Mac OSX: only test native docker version
     - os: osx
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,19 +5,19 @@ For pull requests or local commits:
 
     time (./test/bef && ./test/install && ./test/script_start && ./test/script_end) ; beep
     docker exec grid versions && ./test/after_script && travis lint
-    open ./images/grid_console.png && open ./videos/chrome/*.mkv
-    git checkout -b tmp-3.0.0b4 && git checkout ./images/grid_console.png
+    open ./images/grid2_console.png && open ./images/grid3_console.png && open ./videos/chrome/*.mkv
+    git checkout -b tmp-3.0.0b4a && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
     git commit -m "Add Selenium 3.0.0-beta4 via docker run -e USE_SELENIUM=3"
-    git tag -d latest && git tag 3.0.0b4 && git push origin tmp-3.0.0b4 && git push --tags
+    git tag -d latest && git tag 3.0.0b4a && git push origin tmp-3.0.0b4a && 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-3.0.0b4 && git push origin --delete tmp-3.0.0b4
+    git checkout master && git pull && git branch -d tmp-3.0.0b4a && git push origin --delete tmp-3.0.0b4a
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- If Chrome version changed upload:
@@ -35,9 +35,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 3.0.0b4 && git push origin :3.0.0b4
+    git tag -d 3.0.0b4a && git push origin :3.0.0b4a
     #git add ...
-    git commit --amend && git tag 3.0.0b4 && git push --force origin tmp-3.0.0b4 && git push --tags
+    git commit --amend && git tag 3.0.0b4a && git push --force origin tmp-3.0.0b4a && 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.
diff --git a/README.md b/README.md
@@ -14,7 +14,11 @@
 * firefox stable [last 18 versions can be found here][2.47.1m]
 * fluxbox or openbox (lightweight window managers)
 
-![docker-selenium-grid](./images/grid_console.png)
+Selenium 2
+![docker-selenium-grid](./images/grid2_console.png)
+
+Selenium 3
+![docker-selenium-grid](./images/grid3_console.png)
 
 ### Purpose
 The purpose of this project is to have [Selenium][] running as simple and as fast as possible.
@@ -96,6 +100,22 @@ Is now possible to choose Selenium 2 or Selenium 3 via docker run `-e USE_SELENI
 Be ready for seeing your tests failing in Firefox.
 Please google those errors first before opening an issue in this project.
 
+### e.g. Selenium 2 with FF 47.0.1
+```sh
+# capabilities['marionette'] = False
+docker run --rm -ti --name=grid2 -p 4444:24444 -p 5900:25900 \
+  -e USE_SELENIUM=2 \
+  -v /dev/shm:/dev/shm elgalu/selenium
+```
+
+### e.g. Selenium 3 with FF 49.0.1
+```sh
+# capabilities['marionette'] = True
+docker run --rm -ti --name=grid3 -p 4444:24444 -p 5900:25900 \
+  -e USE_SELENIUM=3 \
+  -v /dev/shm:/dev/shm elgalu/selenium
+```
+
 ### Docker Compose
 See [docker-compose](./docs/docker-compose.md)
 
diff --git a/TBD_DOCKER_TAG.md b/TBD_DOCKER_TAG.md
@@ -2,9 +2,12 @@
  + Date: TBD_DATE
  + TBD_COMMIT_MSG
  + Image tag details:
-  + Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
+  + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+  + Selenium 3: 3.0.0-beta4 (3169782)
   + Chrome stable:  TBD_CHROME_STABLE
-  + Firefox stable: TBD_FIREFOX_STABLE
+  + Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
+  + Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
+  + Geckodriver: TBD_GECKO_DRIVER
   + Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
   + Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
   + Timezone: TBD_TIME_ZONE
@@ -16,7 +19,7 @@
   + Tested on kernel CI  host: TBD_HOST_UNAME
   + Built at dev host with: Docker version 1.12.1, build 23cf638
   + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
-  + Built at dev host with: Docker Compose version 1.8.1, build 878cff1
+  + Built at dev host with: Docker Compose version 1.8.0, build f3628c7
   + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
   + Image size: TBD_IMAGE_SIZE
   + Digest: TBD_DIGEST
diff --git a/bin/entry.sh b/bin/entry.sh
@@ -33,9 +33,10 @@ rm -f ${RUN_DIR}/*
 export SELENIUM_JAR_PATH="${SEL_HOME}/selenium-server-standalone-${USE_SELENIUM}.jar"
 export FIREFOX_DEST_BIN="${SEL_HOME}/firefox-for-sel-${USE_SELENIUM}/firefox"
 sudo ln -fs ${FIREFOX_DEST_BIN} /usr/bin/firefox
+export FIREFOX_VERSION=$(firefox_version)
 
 echo "-- INFO: Chrome..... Version: $(chrome_stable_version)"
-echo "-- INFO: Firefox.... Version: $(firefox_version)"
+echo "-- INFO: Firefox.... Version: ${FIREFOX_VERSION}"
 echo "-- INFO: Selenium... Version: ${USE_SELENIUM}"
 
 # export PATH="${PATH}:${BIN_UTILS}"
diff --git a/bin/geckodriver_version b/bin/geckodriver_version
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# Example:
+#  geckodriver --version 2>&1
+#=> geckodriver 0.10.0
+#=> ...... The source is available at....
+
+# Example:
+#=> 0.10.0
+geckodriver --version 2>&1 | grep -Po '(?<=geckodriver )([a-z0-9\.]+)'
diff --git a/bin/versions b/bin/versions
@@ -13,6 +13,9 @@ echo "firefox-for-sel-3_version=$(firefox-for-sel-3_version)"
 echo "chromedriver_version=$(chromedriver_version)"
 chromedriver --version
 
+echo "geckodriver_version=$(geckodriver_version)"
+geckodriver --version
+
 echo "sauce_connect_version=$(sauce_connect_version)"
 sc | grep build
 
diff --git a/images/grid2_console.png b/images/grid2_console.png
diff --git a/images/grid3_console.png b/images/grid3_console.png
diff --git a/test/after_script b/test/after_script
@@ -4,5 +4,7 @@
 docker exec grid stop || true
 docker stop grid || true
 docker rm grid || true
+docker rm -vf grid2 || true
+docker rm -vf grid3 || true
 # quick destroy
 docker rm -vf grid_mock || true
diff --git a/test/script_archive b/test/script_archive
@@ -7,7 +7,7 @@ echo "#=================="
 echo "# Archive artifacts"
 echo "#=================="
 # pending to upload to S3 bucket
-docker cp grid:/test/console.png ./images/grid_console.png
+docker cp grid:/test/console.png ./images/grid2_console.png
 ls -la ./images/
 mkdir -p ./videos
 docker cp grid:/test/videos/chrome ./videos/
diff --git a/test/script_push b/test/script_push
@@ -91,10 +91,12 @@ update_changelog() {
   TBD_DATE=$(date +%F)
   TBD_CHROME_STABLE=$(docker exec grid chrome_stable_version)
   TBD_CHROME_DRIVER=$(docker exec grid chromedriver_version)
+  TBD_GECKO_DRIVER=$(docker exec grid geckodriver_version)
   TBD_CHROMEDRIVER_COMMIT=$(docker exec grid chromedriver_commit_version)
-  TBD_FIREFOX_STABLE=$(docker exec grid firefox_version)
-  TBD_SELENIUM_VERSION=$(docker exec grid selenium_version)
-  TBD_SELENIUM_REVISION=$(docker exec grid selenium_revision_version)
+  TBD_FIREFOX_FOR_SEL2=$(docker exec grid firefox-for-sel-2_version)
+  TBD_FIREFOX_FOR_SEL3=$(docker exec grid firefox-for-sel-3_version)
+  TBD_SELENIUM_2_VERSION=$(docker exec grid selenium_version)
+  TBD_SELENIUM_2_REVISION=$(docker exec grid selenium_revision_version)
   TBD_PYTHON_VERSION=$(docker exec grid python_version)
   TBD_JAVA_BUILD=$(docker exec grid java_build_version)
   TBD_JAVA_VENDOR=$(docker exec grid java_vendor_version)
@@ -117,10 +119,12 @@ update_changelog() {
   sed -i -- "s/TBD_DATE/${TBD_DATE}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_CHROME_STABLE/${TBD_CHROME_STABLE}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_CHROME_DRIVER/${TBD_CHROME_DRIVER}/g" CHANGELOG.md || true
+  sed -i -- "s/TBD_GECKO_DRIVER/${TBD_GECKO_DRIVER}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_CHROMEDRIVER_COMMIT/${TBD_CHROMEDRIVER_COMMIT}/g" CHANGELOG.md || true
-  sed -i -- "s/TBD_FIREFOX_STABLE/${TBD_FIREFOX_STABLE}/g" CHANGELOG.md || true
-  sed -i -- "s/TBD_SELENIUM_VERSION/${TBD_SELENIUM_VERSION}/g" CHANGELOG.md || true
-  sed -i -- "s/TBD_SELENIUM_REVISION/${TBD_SELENIUM_REVISION}/g" CHANGELOG.md || true
+  sed -i -- "s/TBD_FIREFOX_FOR_SEL2/${TBD_FIREFOX_FOR_SEL2}/g" CHANGELOG.md || true
+  sed -i -- "s/TBD_FIREFOX_FOR_SEL3/${TBD_FIREFOX_FOR_SEL3}/g" CHANGELOG.md || true
+  sed -i -- "s/TBD_SELENIUM_2_VERSION/${TBD_SELENIUM_2_VERSION}/g" CHANGELOG.md || true
+  sed -i -- "s/TBD_SELENIUM_2_REVISION/${TBD_SELENIUM_2_REVISION}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_PYTHON_VERSION/${TBD_PYTHON_VERSION}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_JAVA_BUILD/${TBD_JAVA_BUILD}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_JAVA_VENDOR/${TBD_JAVA_VENDOR}/g" CHANGELOG.md || true
@@ -141,7 +145,8 @@ git_diff_add_commit() {
   git status
   git add CHANGELOG.md
   git add capabilities.json
-  git add images/grid_console.png
+  git add images/grid2_console.png
+  git add images/grid3_console.png
   git commit -m "${TRAVIS_TAG}: Update image id, digest & png [ci skip]"
   git --no-pager log -n3
   git branch
diff --git a/test/script_scenario_basic b/test/script_scenario_basic
@@ -14,6 +14,8 @@ docker tag selenium:latest elgalu/selenium:latest
 
 # Ensure clean env
 docker rm -vf grid || true
+docker rm -vf grid2 || true
+docker rm -vf grid3 || true
 # Some dummy log files
 rm -rf **/*"conflicted copy"*.log
 
@@ -87,6 +89,7 @@ docker exec grid3 errors || true
 docker logs grid3
 docker exec -t grid3 run_test
 docker exec grid3 errors || true
+docker cp grid3:/test/console.png ./images/grid3_console.png
 
 # cleanup
 docker stop grid3 || true
