Chore: fix selenium_version & selenium_revision_version

Author: elgalu

CHANGELOG.md

@@ -8,7 +8,7 @@ Note image ids also change after scm-source.json has being updated which trigger
     docker exec grid versions
 
 ## 3.3.1-p0
- + **Changes:** https://github.com/elgalu/docker-selenium/compare/326af92110685041616f79b4...TBD_CUR_COMM (2017-03-30)
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/326af92110685041616f79b4...236b861177bd2917d86 (2017-03-30)
     + Upgrade Selenium minor to from 3.2.0 to 3.3.1
     + Upgrade Firefox major from 51.0.1 to 52.0.2
     + Upgrade GeckoDriver from 0.14.0 to 0.15.0

bin/selenium_revision_version

@@ -1,24 +1,10 @@
 #!/usr/bin/env bash
 set -e
 
-# log_file="selenium_version.log"
-# java -jar ${SELENIUM_JAR_PATH} \
-#   -port ${SELENIUM_HUB_PORT} \
-#   -log ${log_file} \
-#   >/dev/null 2>&1 &
-# pid=$!
-# sleep 1 && kill ${pid} || true
-# rm -f ${log_file}
-
-[ -z "${USE_SELENIUM}" ] && export USE_SELENIUM="$(cat USE_SELENIUM)"
-[ -z "${SELENIUM_JAR_PATH}" ] && export SELENIUM_JAR_PATH="$(cat SELENIUM_JAR_PATH)"
-[ -z "${SELENIUM_HUB_PORT}" ] && export SELENIUM_HUB_PORT="$(cat SELENIUM_HUB_PORT)"
-[ -z "${LOGS_DIR}" ] && export LOGS_DIR="$(cat LOGS_DIR)"
+SELENIUM_JAR_PATH="/home/seluser/selenium-server-standalone-3.jar"
 
 # Selenium 3 - Example:
 #=> 5234b32
-if [ "${USE_SELENIUM}" == "3" ]; then
-  java -jar ${SELENIUM_JAR_PATH} --version \
-    | grep revision \
-    | grep -Po '(?<=revision: )([a-z0-9\.]+)'
-fi
+java -jar ${SELENIUM_JAR_PATH} --version \
+  | grep revision \
+  | grep -Po '(?<=revision: )([a-z0-9\.]+)'

bin/selenium_version

@@ -1,25 +1,11 @@
 #!/usr/bin/env bash
 set -e
 
-# log_file="selenium_version.log"
-# java -jar ${SELENIUM_JAR_PATH} \
-#   -port ${SELENIUM_HUB_PORT} \
-#   -log ${log_file} \
-#   >/dev/null 2>&1 &
-# pid=$!
-# sleep 1 && kill ${pid} || true
-# rm -f ${log_file}
-
-[ -z "${USE_SELENIUM}" ] && export USE_SELENIUM="$(cat USE_SELENIUM)"
-[ -z "${SELENIUM_JAR_PATH}" ] && export SELENIUM_JAR_PATH="$(cat SELENIUM_JAR_PATH)"
-[ -z "${SELENIUM_HUB_PORT}" ] && export SELENIUM_HUB_PORT="$(cat SELENIUM_HUB_PORT)"
-[ -z "${LOGS_DIR}" ] && export LOGS_DIR="$(cat LOGS_DIR)"
+SELENIUM_JAR_PATH="/home/seluser/selenium-server-standalone-3.jar"
 
 # Selenium 3 - Example:
 #=> 3.3.1
-if [ "${USE_SELENIUM}" == "3" ]; then
-  java -jar ${SELENIUM_JAR_PATH} --version \
-    | grep version \
-    | grep -Po '(?<=version: )([a-z0-9\.]+)' \
-    | sed 's/\.$//'
-fi
+java -jar ${SELENIUM_JAR_PATH} --version \
+  | grep version \
+  | grep -Po '(?<=version: )([a-z0-9\.]+)' \
+  | sed 's/\.$//'

test/script_push

@@ -173,6 +173,8 @@ update_changelog() {
   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_SELENIUM_3_VERSION/${TBD_SELENIUM_3_VERSION}/g" CHANGELOG.md || true
+  sed -i -- "s/TBD_SELENIUM_3_REVISION/${TBD_SELENIUM_3_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