Skip to content

Commit

Permalink
Merge branch 'master' into add_unittest_relaxed_security
Browse files Browse the repository at this point in the history
  • Loading branch information
tadashi0713 authored Jan 5, 2019
2 parents afea49a + 442a10a commit 2c9c421
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,11 @@ This [document](README_CLOUD.md) contains information about deploying Docker-And
Genymotion
----------

![Genymotion](images/logo_genymotion.png)
<p align="center">
<img id="geny" src="./images/logo_genymotion_and_dockerandroid.png" />
</p>

For you who do not have ressources to maintain the simulator or to buy machines or need different device profiles, you need to give a try to [Genymotion Cloud](https://www.genymotion.com/cloud/). Docker-Android is integrated with Genymotion on different cloud services, e.g. Genymotion Cloud, AWS, GCP, Alibaba Cloud. Please follow [this document](README_GENYMOTION.md) for more detail.
For you who do not have ressources to maintain the simulator or to buy machines or need different device profiles, you need to give a try to [Genymotion Cloud](https://www.genymotion.com/cloud/). Docker-Android is integrated with Genymotion on different cloud services, e.g. Genymotion Cloud, AWS, GCP, Alibaba Cloud. Please follow [this document](README_GENYMOTION.md) or [this blog](https://medium.com/genymobile/run-your-appium-tests-using-docker-android-genymotion-cloud-e4817132ccd8) for more detail.

Troubleshooting
---------------
Expand Down
2 changes: 2 additions & 0 deletions README_GENYMOTION.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Genymotion Cloud
----------------

![Genymotion](images/logo_genymotion.png)

You can easily scale your Appium tests on Genymotion Android virtual devices in the cloud. They are available on SaaS or as virtual images on AWS, GCP or Alibaba Cloud.

1. On SaaS <br />
Expand Down
Binary file added images/logo_genymotion_and_dockerandroid.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2c9c421

Please sign in to comment.