-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cleanup to support emulator only #7
base: master
Are you sure you want to change the base?
Conversation
bin/adb_server.sh
Outdated
@@ -1,9 +0,0 @@ | |||
#!/usr/bin/env bash | |||
|
|||
adb -P 5037 kill-server |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You might want to reconsider deleting this script which ensures that adb server is running. Furthermore, the relevant part of supervisor's configuration will keep trying to run this, but will fail miserably since it's deleted.
Dockerfile
Outdated
@@ -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 && \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can remove this line as well. it installs rust as a requirement for gnirehtet
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
bin/adb-reconnect.sh
Outdated
else | ||
date > /tmp/reboot | ||
fi | ||
adb -s $d reconnect |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i would keep the timeout to ensure quicker workaround, because adb command can easily get stuck for a long time
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added timeout
bin/device_setup.sh
Outdated
@@ -70,14 +50,6 @@ while sleep 1; do | |||
|
|||
kick_rebooter $d |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unless you install the rebooter app on emulators, this can probably be removed, together with the function definition above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
bin/adb-reconnect.sh
Outdated
@@ -2,11 +2,5 @@ | |||
|
|||
while read d | |||
do | |||
if [ -z "$STF_PROVIDER_PUBLIC_IP" ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
keep in mind that despite the comment below, STF_PROVIDER_PUBLIC_IP variable is not a marker of "real devices".
# Conflicts: # Dockerfile # bin/adb-reconnect.sh # bin/device_setup.sh # bin/metrics-battery.js # cron/root # supervisor/supervisord.conf
* test-butler-update: updated test-butler version
This reverts commit 7503a6d.
bin/device_setup.sh
Outdated
clean_agoda_staff $d | ||
done | ||
|
||
if [ ! -z "$STF_PROVIDER_PUBLIC_IP" ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor comment: can be changed to -n instead.
No description provided.