Cleanup to support emulator only

Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:3.4
 
 MAINTAINER Anton Malinskiy <[email protected]>
 
-ENV PATH $PATH:/opt/platform-tools:/opt/gnirehtet-rust-linux64
+ENV PATH $PATH:/opt/platform-tools
 
 RUN set -xeo pipefail && \
     mkdir -m 0750 /root/.android   && \
@@ -20,14 +20,7 @@ RUN set -xeo pipefail && \
     rm "/root/.wget-hsts" && \
     rm "/tmp/glibc.apk" "/tmp/glibc-bin.apk" && \
     curl https://sh.rustup.rs -sSf | sh -s -- -y && \
-    curl -sL -o gnirehtet.zip https://github.com/Genymobile/gnirehtet/releases/download/v2.3/gnirehtet-rust-linux64-v2.3.zip && \
-    echo "561d77e94d65ecf2d919053e5da6109b8cceb73bffedea71cd4e51304ccaa3d3  gnirehtet.zip" | sha256sum -c && \
     mkdir -p /opt && \
-    unzip gnirehtet.zip -d /opt && \
-    chmod +x /opt/gnirehtet-rust-linux64/gnirehtet && \
-    mv /opt/gnirehtet-rust-linux64/* / && \
-    rm -R /opt/gnirehtet-rust-linux64 && \
-    rm gnirehtet.zip && \
     rm -r /var/cache/apk/APKINDEX.* && \
     npm install rethinkdb
 

bin/adb-reconnect.sh

@@ -2,11 +2,5 @@
 
 while read d
 do
-  if [ -z "$STF_PROVIDER_PUBLIC_IP" ]; then
-    # real devices
-    timeout -t 3 adb -s $d reboot
-    timeout -t 3 adb -s $d reconnect
-  else
-    date > /tmp/reboot
-  fi
+    adb -s $d reconnect
 done < "${1:-/dev/stdin}"

bin/device_setup.sh

@@ -1,33 +1,13 @@
 #!/usr/bin/env bash
 
 DL=/tmp/devices_list
-PKG=com.genymobile.gnirehtet
 
 rm -f $DL
 touch -f $DL
 sleep 10
 
 cd / || exit
 
-function setup_gnirehtet {
-  local DEVICE=$1
-
-  if (echo -n | adb -s $d shell pm list packages | grep -q $PKG); then
-    echo Already have $PKG
-  else
-    echo Not installed $PKG
-    echo -n | timeout -t 30 ./gnirehtet install $DEVICE
-    echo -n | timeout -t 30 adb -s $d reverse localabstract:gnirehtet tcp:31416
-    echo -n | timeout -t 30 adb -s $d shell am broadcast -a com.genymobile.gnirehtet.START -n com.genymobile.gnirehtet/.GnirehtetControlReceiver --esa dnsServers 10.120.1.123
-  fi
-}
-
-function cleanup_gnirehtet {
-  local DEVICE=$1
-  echo -n | timeout -t 30  ./gnirehtet stop $DEVICE
-  echo -n | timeout -t 30  ./gnirehtet uninstall $DEVICE
-}
-
 function clean_agoda_staff {
   local DEVICE=$1
 
@@ -70,14 +50,6 @@ while sleep 1; do
 
     kick_rebooter $d
 
-    if [ "$GNIREHTET_ENABLED" = "true" ]; then
-      echo Gonna setup gnirehtet for $d
-      setup_gnirehtet $d
-    else
-      echo Gonna cleanup gnrehtet for $d
-      cleanup_gnirehtet $d
-    fi
-
     clean_agoda_staff $d
   done
 

cron/root

@@ -1,5 +1,4 @@
 * * * * * /bin/bash /metrics.sh
 * * * * * /bin/bash /usb-rebind.sh
 * * * * * /usr/bin/node /label.js
-* * * * * /usr/bin/node /metrics-battery.js
 * * * * * /usr/bin/node /device-status-monitor.js | /bin/bash /adb-reconnect.sh

supervisor/supervisord.conf

@@ -24,11 +24,6 @@ command=/adb_server.sh
 autorestart=true
 priority=10000
 
-[program:gnirehtet_start]
-command=/gnirehtet_start.sh
-autorestart=true
-priority=9000
-
 [program:bootstrap]
 command=/stf_bootstrap.sh
 priority=8000
@@ -41,9 +36,5 @@ priority=7000
 [program:cron]
 command=crond -f
 
-[program:gnirehtet_reconnect]
-command=/gnirehtet_reconnect.sh
-autorestart=true
-
 [include]
 files = /etc/supervisord.d/*.conf