Skip to content
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

Open
wants to merge 18 commits into
base: master
Choose a base branch
from

Conversation

mmishra-agoda
Copy link

No description provided.

@mmishra-agoda mmishra-agoda requested a review from memega October 6, 2020 11:25
@@ -1,9 +0,0 @@
#!/usr/bin/env bash

adb -P 5037 kill-server
Copy link

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 && \
Copy link

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

else
date > /tmp/reboot
fi
adb -s $d reconnect
Copy link

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added timeout

@@ -70,14 +50,6 @@ while sleep 1; do

kick_rebooter $d
Copy link

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.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -2,11 +2,5 @@

while read d
do
if [ -z "$STF_PROVIDER_PUBLIC_IP" ]; then
Copy link

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".

@mmishra-agoda mmishra-agoda changed the base branch from master to feature/reverse-tethering-tmp October 7, 2020 08:09
# Conflicts:
#	Dockerfile
#	bin/adb-reconnect.sh
#	bin/device_setup.sh
#	bin/metrics-battery.js
#	cron/root
#	supervisor/supervisord.conf
@Raikerian Raikerian changed the base branch from feature/reverse-tethering-tmp to master November 22, 2021 16:43
clean_agoda_staff $d
done

if [ ! -z "$STF_PROVIDER_PUBLIC_IP" ]; then

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants