Formatted

Fix an issue when attempting to detect an existing AVD image

.travis.yml

@@ -1,30 +0,0 @@
-language: python
-
-python:
-  - "3.5"
-
-sudo: required
-
-services:
-  - docker
-
-install: "pip install -r requirements.txt"
-
-env:
-  - ANDROID_VERSION=5.0.1
-  - ANDROID_VERSION=5.1.1
-  - ANDROID_VERSION=6.0
-  - ANDROID_VERSION=7.0
-  - ANDROID_VERSION=7.1.1
-  - ANDROID_VERSION=8.0
-  - ANDROID_VERSION=8.1
-  - ANDROID_VERSION=9.0
-  - ANDROID_VERSION=10.0
-  - ANDROID_VERSION=11.0
-  - REAL_DEVICE=True
-  - GENYMOTION=True
-
-script: bash travis.sh
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -4,11 +4,12 @@
 
 [![Analytics](https://ga-beacon.appspot.com/UA-133466903-1/github/budtmo/docker-android/README.md)](https://github.com/igrigorik/ga-beacon "Analytics")
 [![Join the chat at https://gitter.im/budtmo/docker-android](https://badges.gitter.im/budtmo/docker-android.svg)](https://gitter.im/budtmo/docker-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/budtmo/docker-android.svg?branch=master)](https://travis-ci.org/budtmo/docker-android)
+[![Build Status](https://dev.azure.com/budtmoos/budtmoos/_apis/build/status/budtmo.docker-android.test?branchName=master)](https://dev.azure.com/budtmoos/budtmoos/_build/latest?definitionId=7&branchName=master)
 [![codecov](https://codecov.io/gh/budtmo/docker-android/branch/master/graph/badge.svg)](https://codecov.io/gh/budtmo/docker-android)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3f000ffb97db45a59161814e1434c429)](https://www.codacy.com/app/butomo1989/docker-appium?utm_source=github.com&utm_medium=referral&utm_content=butomo1989/docker-appium&utm_campaign=Badge_Grade)
 [![GitHub release](https://img.shields.io/github/release/budtmo/docker-android.svg)](https://github.com/budtmo/docker-android/releases)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android?ref=badge_shield)
+[![Paypal Donate](https://img.shields.io/badge/paypal-donate-blue.svg)](http://paypal.me/budtmo)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 
 Docker-Android is a docker image built to be used for everything related to mobile website testing and Android project.
@@ -81,7 +82,14 @@ Docker is installed in your system.
 Quick Start
 -----------
 
-1. Run Docker-Android
+1. Your machine need to support virtualization. To check it:
+
+	```
+	sudo apt install cpu-checker
+	kvm-ok
+	```
+
+2. Run Docker-Android
 
 	- For ***Linux OS***, please use image name that contains "x86"
 
@@ -92,7 +100,7 @@ Quick Start
 	- For ***OSX*** and ***Windows OS***, please use Virtual Machine that support Virtualization with Ubuntu OS
 
 
-2. Verify the ip address of docker host.
+3. Verify the ip address of docker host.
 
    - For OSX, you can find out by using following command:
 
@@ -102,7 +110,7 @@ Quick Start
 
    - For different OS, localhost should work.
 
-3. Open ***http://docker-host-ip-address:6080*** from web browser. Note: Adding ```?view_only=true``` will give user only view only permission.
+4. Open ***http://docker-host-ip-address:6080*** from web browser. Note: Adding ```?view_only=true``` will give user only view only permission.
 
 Custom configurations
 ---------------------

README_APPIUM_AND_SELENIUM.md

@@ -25,6 +25,7 @@ It is also possible to connect appium server that run inside docker-android with
 - SELENIUM_HOST="\<host\_ip\_address>"
 - SELENIUM_PORT=\<port\_number>
 - SELENIUM_TIMEOUT=\<timeout\_in\_seconds>
+- SELENIUM_PROXY_CLASS=\<selenium\_proxy\_class\_name>
 
 To run tests for mobile browser, following parameter can be passed:
 

docker/Emulator_x86

@@ -1,4 +1,4 @@
-FROM appium/appium:1.20.0-p0
+FROM appium/appium:v1.21.0-p0
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 

docker/Genymotion

@@ -1,4 +1,4 @@
-FROM appium/appium:1.20.0-p0
+FROM appium/appium:v1.21.0-p0
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 

docker/Real_device

@@ -1,4 +1,4 @@
-FROM appium/appium:1.20.0-p0
+FROM appium/appium:v1.21.0-p0
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 

pipelines/release-emulators.yml

@@ -0,0 +1,48 @@
+trigger:
+  tags:
+    include:
+    - v*
+
+jobs:
+- job: build_and_release_emulators
+  pool:
+    vmImage: ubuntu-20.04
+  strategy:
+    maxParallel: 10
+    matrix:
+      5.0.1:
+        android.version: '5.0.1'
+      5.1.1:
+        android.version: '5.1.1'
+      6.0:
+        android.version: '6.0'
+      7.0:
+        android.version: '7.0'
+      7.1.1:
+        android.version: '7.1.1'
+      8.0:
+        android.version: '8.0'
+      8.1:
+        android.version: '8.1'
+      9.0:
+        android.version: '9.0'
+      10.0:
+        android.version: '10.0'
+      11.0:
+        android.version: '11.0'
+  steps:
+  - script: |
+      latest_tag=$(git describe --tags --abbrev=0)
+      echo "##vso[task.setvariable variable=release_version]$latest_tag"
+
+    displayName: 'Get the latest release tag'
+
+  - script: |
+      docker login -u $(DOCKER_USERNAME) -p=$(DOCKER_PASSWORD)
+      TOKEN=$(polyverse_token) ./release.sh all $(android.version) $(release_version)
+      docker logout
+
+    displayName: 'Build docker image, run unit tests and push the docker image'
+
+  - script: bash <(curl -s https://codecov.io/bash)
+    displayName: 'Publish test result'

pipelines/release-genymotion-and-device.yml

@@ -0,0 +1,32 @@
+trigger:
+  tags:
+    include:
+    - v*
+
+jobs:
+- job: build_and_release_genymotion_and_device
+  pool:
+    vmImage: ubuntu-20.04
+  strategy:
+    maxParallel: 2
+    matrix:
+      genymotion:
+        script.name: './release_real.sh'
+      real_device:
+        script.name: './release_genymotion.sh'
+  steps:
+  - script: |
+      latest_tag=$(git describe --tags --abbrev=0)
+      echo "##vso[task.setvariable variable=release_version]$latest_tag"
+
+    displayName: 'Get the latest release tag'
+
+  - script: |
+      docker login -u $(DOCKER_USERNAME) -p=$(DOCKER_PASSWORD)
+      TOKEN=$(p_token) $(script.name) all $(release_version)
+      docker logout
+
+    displayName: 'Build docker image, run unit tests and push the docker image'
+
+  - script: bash <(curl -s https://codecov.io/bash)
+    displayName: 'Publish test result'

pipelines/test-pipeline.yml

@@ -0,0 +1,29 @@
+trigger:
+  branches:
+    include:
+    - master
+
+pr:
+  branches:
+    include:
+    - '*'
+
+variables:
+  - name: app_version
+    value: test
+
+jobs:
+- job: build_and_test
+  pool:
+    vmImage: ubuntu-20.04
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.5'
+      displayName: 'Use Python 3.5'
+  - script: pip install -r requirements.txt
+    displayName: 'Install pip packages'
+  - script: ./release.sh test 7.1.1 $(app_version) 
+    displayName: 'Build Docker image with Android 7.1.1 and run unit tests'
+  - script: bash <(curl -s https://codecov.io/bash)
+    displayName: 'Publish test result'

revert.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-IMAGE_NAME="budtmo/docker-android"
-
-if [ -z "$1" ]; then
-    read -p "Type : " TYPE
-else
-    TYPE=$1
-fi
-
-if [ -z "$2" ]; then
-    read -p "Version : " VERSION
-else
-    VERSION=$2
-fi
-
-declare -a versions=("7.1.1" "7.0" "6.0" "5.1.1" "5.0.1")
-
-## now loop through the above array
-for v in "${versions[@]}"
-do
-	IMAGE="$IMAGE_NAME-$TYPE-$v"
-	IMAGE_OLD="$IMAGE:$VERSION"
-	IMAGE_LATEST="$IMAGE:latest"
-	echo "Revert image \"$IMAGE_LATEST\" to version \"$IMAGE_OLD\""
-	docker pull $IMAGE_OLD
-	docker tag $IMAGE_OLD $IMAGE_LATEST
-	docker push $IMAGE_LATEST
-done

src/app.py

@@ -149,9 +149,10 @@ def appium_run(avd_name: str):
             selenium_host = os.getenv('SELENIUM_HOST', '172.17.0.1')
             selenium_port = int(os.getenv('SELENIUM_PORT', 4444))
             selenium_timeout = int(os.getenv('SELENIUM_TIMEOUT', 30))
+            selenium_proxy_class = os.getenv('SELENIUM_PROXY_CLASS', 'org.openqa.grid.selenium.proxy.DefaultRemoteProxy')
             browser_name = default_web_browser if mobile_web_test else 'android'
             create_node_config(avd_name, browser_name, appium_host, appium_port, selenium_host, selenium_port,
-                               selenium_timeout)
+                               selenium_timeout, selenium_proxy_class)
             cmd += ' --nodeconfig {file}'.format(file=CONFIG_FILE)
         except ValueError as v_err:
             logger.error(v_err)
@@ -160,7 +161,7 @@ def appium_run(avd_name: str):
 
 
 def create_node_config(avd_name: str, browser_name: str, appium_host: str, appium_port: int, selenium_host: str,
-                       selenium_port: int, selenium_timeout: int):
+                       selenium_port: int, selenium_timeout: int, selenium_proxy_class: str):
     """
     Create custom node config file in json format to be able to connect with selenium server.
 
@@ -170,6 +171,7 @@ def create_node_config(avd_name: str, browser_name: str, appium_host: str, appiu
     :param selenium_host: Host where selenium server is running
     :param selenium_port: Port number where selenium server is running
     :param selenium_timeout: Selenium session timeout in seconds
+    :param selenium_proxy_class: Selenium Proxy class created in Selenium hub
     """
     config = {
         'capabilities': [
@@ -185,11 +187,11 @@ def create_node_config(avd_name: str, browser_name: str, appium_host: str, appiu
         'configuration': {
             'cleanUpCycle': 2000,
             'timeout': selenium_timeout,
-            'proxy': 'org.openqa.grid.selenium.proxy.DefaultRemoteProxy',
+            'proxy': selenium_proxy_class,
             'url': 'http://{host}:{port}/wd/hub'.format(host=appium_host, port=appium_port),
             'host': appium_host,
             'port': appium_port,
-            'maxSession': 6,
+            'maxSession': 1,
             'register': True,
             'registerCycle': 5000,
             'hubHost': selenium_host,

src/tests/unit/test_appium.py

@@ -58,7 +58,8 @@ class TestAppium(TestCase):
     def test_config_creation(self):
         from src import CONFIG_FILE
         self.assertFalse(os.path.exists(CONFIG_FILE))
-        app.create_node_config('test', 'android', '127.0.0.1', 4723, '127.0.0.1', 4444, 30)
+        app.create_node_config('test', 'android', '127.0.0.1', 4723, '127.0.0.1', 4444, 30,
+                               'org.openqa.grid.selenium.proxy.DefaultRemoteProxy')
         self.assertTrue(os.path.exists(CONFIG_FILE))
         os.remove(CONFIG_FILE)
 

travis.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# Bash version should >= 4 to be able to run this script.
-
-if [ -z "$TRAVIS_TAG" ]; then
-    echo "UNIT TEST ONLY"
-    bash release.sh test all all 0.1
-else
-    if [ ! -z "$ANDROID_VERSION" ]; then
-      echo "Log in to docker hub"
-      docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-      echo "[Version: $ANDROID_VERSION] RUN UNIT TEST, BUILD DOCKER IMAGES AND PUSH THOSE TO DOCKER HUB"
-      bash release.sh all $ANDROID_VERSION $TRAVIS_TAG
-    elif [ ! -z "$REAL_DEVICE" ]; then
-      echo "[SUPPORT FOR REAL DEVICE: BUILD DOCKER IMAGES AND PUSH THOSE TO DOCKER HUB ]"
-      bash release_real.sh all $TRAVIS_TAG
-    elif [ ! -z "$GENYMOTION" ]; then
-      echo "[SUPPORT FOR GENYMOTION: BUILD DOCKER IMAGES AND PUSH THOSE TO DOCKER HUB ]"
-      bash release_genymotion.sh all $TRAVIS_TAG
-    fi
-    echo "Log out of docker hub"
-    docker logout
-fi