fastlane-plugin-mango 1.1.6 → 1.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed170b21d2657138918bb05cda96147bcec67db16311d04b179f7a897f67b0df
-  data.tar.gz: c57446317b989992adfc8917a7e413a41f171110be888d38bde576e4bdde1a33
+  metadata.gz: e38a84cceed91c04a4ce62698766017ee521d3721d885276087b8b47ec57de73
+  data.tar.gz: 9e8569619ff82aa951602614b7aae19a1a1247af2ab5b87ba2ba3fb665130132
 SHA512:
-  metadata.gz: 4486ba5047f7a8757bd93cdaed54ceb35a1cc2997da737771cce5adcde318e989e76eed1a957da5bcb2f5a13b1856723e110d621e80d62218ffdfbfe1d218b9f
-  data.tar.gz: e8ddca2399e990354181dc65ba64d23614763a10183a73e973be87fa5a3eee4b283b2da942adb48b37ee59697d8d94c4d98a4adbf3f8e4d0467c5484d6d50f54
+  metadata.gz: e4721cdac4969cdfd8dd7f86143b07edc87ce0853b868ba68d0c3c509f23265300832ff77e6acb3f761c78d8c86c11944768de059c092927cec3f856d95213ae
+  data.tar.gz: 4a677f075b53365135d3a498e4393cc37cef755e27dd18cba8299fe602d571562b29c7955c6d3e5dce709cbec54e604615d3e8afee4bb747921c6e89ca5524a9

data/README.md

@@ -4,7 +4,7 @@
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-mango) [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/xing/mango/blob/master/LICENSE)
 [![Gem](https://img.shields.io/gem/v/fastlane-plugin-mango.svg?style=flat)](http://rubygems.org/gems/fastlane-plugin-mango)
 
-A fastlane plugin that runs Android tasks on a specified [Docker](https://www.docker.com/) image
+A fastlane plugin that runs Android tasks on a specified [Docker](https://www.docker.com/) image. Can be used for orchestrating android tasks on a CI syste.
 
 <img src="assets/mango_logo.png" alt="Mango Logo" width="256px" height="256px"/>
 
@@ -47,19 +47,26 @@ desc "Run espresso tests on docker images"
    end
 ```
 
-or to this for unit tests or other gradle tasks:
+or to this for unit tests or other gradle tasks(some of the variables are optional):
 ```ruby
 desc "Run unit tests on docker images"
-  lane :Unit_Tests do
-     run_dockerized_task(
-       container_name: "unit_tests_container",
-       port_factor: options[:port_factor],
-       docker_image: "joesss/mango-base:latest",
-       is_running_on_emulator: false,
-       android_task: "./gradlew testDebug",
-       pull_latest_image: true         
-     )
-   end
+  lane :example do
+    run_dockerized_task(
+      container_name: "emulator_#{options[:port_factor]}",
+      port_factor: options[:port_factor],
+      docker_image: 'joesss/mango-base:latest',
+      android_task: './gradlew testDebug',
+      post_actions: 'adb logcat -d > logcat.txt',
+      bundle_install: true,
+      core_amount: '8',
+      workspace_dir: '/root/tests/espresso-tests',
+      docker_registry_login: "docker login -u='USER' -p='PASS' some.docker.com",
+      pull_latest_image: true,
+      pre_action: 'echo $GIT_BRANCH > /root/.branch',
+      vnc_enabled: false,
+      environment_variables: options[:environment_variables] ? options[:environment_variables].split(' ') : ''
+    )
+  end
 ```
 
 Now you can call this new lane by calling `bundle exec fastlane Espresso_Tests`.
@@ -78,6 +85,7 @@ The `mango` action has plenty of options to configure it.
 | `docker_image` | Name of the Docker image, that should be started and used to run your tasks. | butomo1989/docker-android-x86-5.1.1 | ❌ | `String` |
 | `container_timeout` | Timeout (in seconds) to get a healthy docker container. Depending on your `docker_image` it may take some time until it's started up and ready to use. | 450 (this equals 7.5 minutes) | ❌ | `Integer` |
 | `android_task` | A generic Android task you want to execute. | - | ❌ | `String` |
+| `core_amount` | Cpu core amount while starting docker container with limited resource. | - | ✅ | `Integer` |
 | `sdk_path` | The path to your Android sdk directory. | `ANDROID_HOME` environment variable | ✅ | `String` |
 | `port_factor` | Base for calculating a unique port for noVNC. We recommend to use the `EXECUTOR_NUMBER` from your Jenkins environment. | - | ✅ | `String` |
 | `workspace_dir` | Path to the workspace to execute commands. If you want to execute your `android_task` from a different directory you have to specify `workspace_dir`. | `/root/tests/` | ✅ | `String` |

data/lib/fastlane/plugin/mango/actions/run_dockerized_task_action.rb

@@ -4,7 +4,9 @@ module Fastlane
   module Actions
     class RunDockerizedTaskAction < Action
       def self.run(params)
-        UI.important("The mango plugin is working!")
+        UI.important('The mango plugin is working!')
+        workspace_dir = params[:workspace_dir]
+        ENV['DOCKER_CONFIG'] = "#{ENV['WORKSPACE']}/.docker"
         mango_helper = Fastlane::Helper::MangoHelper.new(params)
         mango_helper.setup_container
 
@@ -12,32 +14,45 @@ module Fastlane
 
         failure_buffer_timeout = 5
         timeout_command = "timeout #{params[:maximal_run_time] - failure_buffer_timeout}m"
-        workspace_dir = params[:workspace_dir]
 
         android_task = params[:android_task]
         if android_task
-          UI.success("Starting Android Task.")
+          UI.success('Starting Android Task.')
           bundle_install = params[:bundle_install] ? '&& bundle install ' : ''
 
           docker_commander.exec(command: "cd #{workspace_dir} #{bundle_install}&& #{timeout_command} #{android_task} || exit 1")
         end
-
+      rescue StandardError => e
+        begin
+          Actions.sh("docker logs #{mango_helper.container_name} --tail 200")
+        rescue StandardError
+          # do nothing
+        end
+        docker_commander.exec(command:
+                                  'cat /var/log/supervisor/docker-android.stderr.log', raise_when_fail: false)
+        docker_commander.exec(command: 'cat /var/log/supervisor/supervisord.log',
+                              raise_when_fail: false)
+        raise e
       ensure
-        post_actions = params[:post_actions]
-        if post_actions && !mango_helper.kvm_disabled?
-          docker_commander&.exec(command: "cd #{workspace_dir} && #{post_actions}")
+        begin
+          post_actions = params[:post_actions]
+          if post_actions && !mango_helper.kvm_disabled?
+            docker_commander&.exec(command: "cd #{workspace_dir} && #{post_actions}")
+          end
+
+          UI.important("Cleaning up #{params[:emulator_name]} container")
+          docker_commander.delete_container if mango_helper&.instance_variable_get('@container')
+        rescue StandardError => e
+          puts e
         end
-
-        UI.important("Cleaning up #{params[:emulator_name]} container")
-        mango_helper.clean_container if mango_helper&.instance_variable_get('@container')
       end
 
       def self.description
-        "Action that runs Android tasks on a specified Docker image"
+        'Action that runs Android tasks on a specified Docker image'
       end
 
       def self.authors
-        ["Serghei Moret", "Daniel Hartwich"]
+        ['Serghei Moret', 'Daniel Hartwich']
       end
 
       def self.return_value
@@ -50,130 +65,144 @@ module Fastlane
 
       def self.details
         # Optional:
-        ""
+        ''
       end
 
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :container_name,
-                                      env_name: "CONTAINER_NAME",
-                                      description: "Name of the docker container. Will be generated randomly if not defined",
-                                      optional: true,
-                                      type: String),
+                                       env_name: 'CONTAINER_NAME',
+                                       description: 'Name of the docker container. Will be generated randomly if not defined',
+                                       optional: true,
+                                       type: String),
 
           FastlaneCore::ConfigItem.new(key: :no_vnc_port,
-                                       env_name: "NO_VNC_PORT",
-                                       description: "Port to redirect noVNC. 6080 by default",
+                                       env_name: 'NO_VNC_PORT',
+                                       description: 'Port to redirect noVNC. 6080 by default',
                                        default_value: 6080,
                                        optional: false,
                                        type: Integer),
 
           FastlaneCore::ConfigItem.new(key: :device_name,
-                                       env_name: "DEVICE_NAME",
-                                       description: "Name of the Android device. Nexus 5X by default",
+                                       env_name: 'DEVICE_NAME',
+                                       description: 'Name of the Android device. Nexus 5X by default',
                                        default_value: 'Nexus 5X',
                                        optional: false,
                                        type: String),
 
           FastlaneCore::ConfigItem.new(key: :emulator_name,
-                                       env_name: "EMULATOR_NAME",
-                                       description: "Name of the Android emulator. emulator-5554 by default",
+                                       env_name: 'EMULATOR_NAME',
+                                       description: 'Name of the Android emulator. emulator-5554 by default',
                                        default_value: 'emulator-5554',
                                        optional: false,
                                        type: String),
 
           FastlaneCore::ConfigItem.new(key: :docker_image,
-                                       env_name: "DOCKER_IMAGE",
-                                       description: "Name of the Docker image. butomo1989/docker-android-x86-5.1.1 by default",
+                                       env_name: 'DOCKER_IMAGE',
+                                       description: 'Name of the Docker image. butomo1989/docker-android-x86-5.1.1 by default',
                                        default_value: 'butomo1989/docker-android-x86-5.1.1',
                                        optional: false,
                                        type: String),
 
           FastlaneCore::ConfigItem.new(key: :container_timeout,
-                                      env_name: "CONTAINER_TIMEOUT",
-                                      description: "Timeout (in seconds) to get the healthy docker container. 450 (7.5 minutes) by default",
-                                      default_value: 450,
-                                      optional: false,
-                                      type: Integer),
-
-         FastlaneCore::ConfigItem.new(key: :android_task,
-                                      env_name: "ANDROID TASK",
-                                      description: "A generic Android task you want to execute",
-                                      is_string: true,
-                                      optional: false),
+                                       env_name: 'CONTAINER_TIMEOUT',
+                                       description: 'Timeout (in seconds) to get the healthy docker container. 450 (7.5 minutes) by default',
+                                       default_value: 450,
+                                       optional: false,
+                                       type: Integer),
+
+          FastlaneCore::ConfigItem.new(key: :android_task,
+                                       env_name: 'ANDROID TASK',
+                                       description: 'A generic Android task you want to execute',
+                                       is_string: true,
+                                       optional: false),
 
           FastlaneCore::ConfigItem.new(key: :sdk_path,
-                                       env_name: "SDK_PATH",
-                                       description: "The path to your Android sdk directory (root). ANDROID_HOME by default",
+                                       env_name: 'SDK_PATH',
+                                       description: 'The path to your Android sdk directory (root). ANDROID_HOME by default',
                                        default_value: ENV['ANDROID_HOME'],
                                        is_string: true,
                                        optional: true),
 
           FastlaneCore::ConfigItem.new(key: :port_factor,
-                                      env_name: "PORT_FACTOR",
-                                      description: "Base for calculating a unique port for noVNC. You can pass EXECUTOR_NUMBER from Jenkins for example, this will be unique and not clash in case of several instances running on the same machine",
-                                      optional: true,
-                                      type: String),
+                                       env_name: 'PORT_FACTOR',
+                                       description: 'Base for calculating a unique port for noVNC. You can pass EXECUTOR_NUMBER from Jenkins for example, this will be unique and not clash in case of several instances running on the same machine',
+                                       optional: true,
+                                       type: String),
+
+          FastlaneCore::ConfigItem.new(key: :core_amount,
+                                       env_name: 'CORE_AMOUNT',
+                                       default_value: 0,
+                                       description: 'Define if we want to start docker container with the limitation',
+                                       optional: true,
+                                       type: Integer),
 
           FastlaneCore::ConfigItem.new(key: :workspace_dir,
-                                       env_name: "WORKSPACE_DIR",
+                                       env_name: 'WORKSPACE_DIR',
                                        default_value: '/root/tests/',
-                                       description: "Path to the workspace to execute commands. If you want to execute your `android_task` from a different directory you have to specify `workspace_dir`",
+                                       description: 'Path to the workspace to execute commands. If you want to execute your `android_task` from a different directory you have to specify `workspace_dir`',
                                        optional: true,
                                        type: String),
 
           FastlaneCore::ConfigItem.new(key: :maximal_run_time,
-                                       env_name: "MAXIMAL_RUN_TIME",
+                                       env_name: 'MAXIMAL_RUN_TIME',
                                        default_value: 60,
-                                       description: "Defines the maximal time of your test run. Defaults to 60 minutes",
+                                       description: 'Defines the maximal time of your test run. Defaults to 60 minutes',
                                        optional: true,
                                        type: Integer),
 
           FastlaneCore::ConfigItem.new(key: :bundle_install,
-                                       env_name: "BUNDLE_INSTALL",
+                                       env_name: 'BUNDLE_INSTALL',
                                        default_value: false,
-                                       description: "Defines if the Android task must execute bundle install before running a build",
+                                       description: 'Defines if the Android task must execute bundle install before running a build',
                                        optional: true,
                                        type: Boolean),
 
           FastlaneCore::ConfigItem.new(key: :is_running_on_emulator,
-                                       env_name: "IS_RUNNING_ON_EMULATOR",
+                                       env_name: 'IS_RUNNING_ON_EMULATOR',
                                        default_value: true,
-                                       description: "Define if we want to run the emulator in the container",
+                                       description: 'Define if we want to run the emulator in the container',
                                        optional: true,
                                        type: Boolean),
 
           FastlaneCore::ConfigItem.new(key: :post_actions,
-                                      env_name: "POST_ACTIONS",
-                                      description: "Actions that will be executed after the main command has been executed",
-                                      is_string: true,
-                                      optional: true),
+                                       env_name: 'POST_ACTIONS',
+                                       description: 'Actions that will be executed after the main command has been executed',
+                                       is_string: true,
+                                       optional: true),
 
           FastlaneCore::ConfigItem.new(key: :pre_action,
-                                      env_name: "PRE_ACTION",
-                                      description: "Actions that will be executed before the docker image gets pulled",
-                                      is_string: true,
-                                      optional: true),
+                                       env_name: 'PRE_ACTION',
+                                       description: 'Actions that will be executed before the docker image gets pulled',
+                                       is_string: true,
+                                       optional: true),
 
           FastlaneCore::ConfigItem.new(key: :docker_registry_login,
-                                      env_name: "DOCKER_REGISTRY_LOGIN",
-                                      description: "Authenticating yourself to a custom Docker registry",
-                                      type: String,
-                                      optional: true),
+                                       env_name: 'DOCKER_REGISTRY_LOGIN',
+                                       description: 'Authenticating yourself to a custom Docker registry',
+                                       type: String,
+                                       optional: true),
 
           FastlaneCore::ConfigItem.new(key: :pull_latest_image,
-                                      env_name: "PULL_LATEST_IMAGE",
-                                      description: "Define if you want to pull the latest image",
-                                      type: Boolean,
-                                      default_value: false,
-                                      optional: true),
+                                       env_name: 'PULL_LATEST_IMAGE',
+                                       description: 'Define if you want to pull the latest image',
+                                       type: Boolean,
+                                       default_value: false,
+                                       optional: true),
 
           FastlaneCore::ConfigItem.new(key: :environment_variables,
-                                      env_name: "ENVIRONMENT_VARIABLES",
-                                      description: "Comma seperated list of environment variables which are passed into the docker container",
-                                      type: Array,
-                                      default_value: [],
-                                      optional: true)
+                                       env_name: 'ENVIRONMENT_VARIABLES',
+                                       description: 'Comma seperated list of environment variables which are passed into the docker container',
+                                       type: Array,
+                                       default_value: [],
+                                       optional: true),
+
+          FastlaneCore::ConfigItem.new(key: :vnc_enabled,
+                                       env_name: 'VNC_ENABLED',
+                                       description: 'A bool. True for vnc_enabled False for vnc_disabled',
+                                       type: Boolean,
+                                       default_value: true,
+                                       optional: true)
         ]
       end
     end

data/lib/fastlane/plugin/mango/helper/cpu_load_handler.rb

@@ -0,0 +1,40 @@
+require 'os'
+
+module Fastlane
+  module Helper
+    module CpuLoadHandler
+      def self.print_cpu_load(load = cpu_load)
+        UI.important("CPU load is: #{load}") if load
+      end
+
+      # Gets load average of Linux machine
+      def self.cpu_load
+        load = Actions.sh('cat /proc/loadavg')
+        load.split(' ').first.to_f unless load.empty?
+      end
+
+      # Gets amount of the CPU cores
+      def self.cpu_core_amount
+        Actions.sh("cat /proc/cpuinfo | awk '/^processor/{print $3}' | tail -1")
+      end
+
+      # For half an hour waiting until CPU load average is less than number of cores*2 (which considers that CPU is ready)
+      # Raises when 30 minutes timeout exceeds
+      def self.wait_cpu_to_idle
+        if OS.linux?
+          30.times do
+            load = cpu_load
+            return true if load <= cpu_core_amount.to_i * 1.5
+
+            print_cpu_load(load)
+            UI.important('Waiting for available resources..')
+            sleep 60
+          end
+        else
+          return true
+        end
+        raise "CPU was overloaded. Couldn't start emulator"
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/mango/helper/docker_commander.rb

@@ -1,10 +1,8 @@
 require 'docker'
-require 'os'
 
 module Fastlane
   module Helper
     class DockerCommander
-
       attr_accessor :container_name
 
       def initialize(container_name)
@@ -12,66 +10,67 @@ module Fastlane
       end
 
       def pull_image(docker_image_name:)
-        handle_thin_pool_exception do
-          Actions.sh("docker pull #{docker_image_name}")
-        end
+        Actions.sh("docker pull #{docker_image_name}")
+      rescue StandardError => e
+        prune if e.message =~ /Create more free space in thin pool/
+        Actions.sh("docker pull #{docker_image_name}")
       end
 
-      def start_container(emulator_args:, docker_image:)
+      def start_container(emulator_args:, docker_image:, core_amount:)
+        retries ||= 0
         docker_name = if container_name
                         "--name #{container_name}"
                       else
                         ''
                       end
+        # if core_amount value is defined then limit the container while starting
+        core_amount = if core_amount && core_amount > 0
+                        "--cpus=#{core_amount}"
+                      else
+                        ''
+                      end
 
         # Action.sh returns all output that the command produced but we are only
         # interested in the last line, since it contains the id of the created container.
         UI.important("Attaching #{ENV['PWD']} to the docker container")
-        handle_thin_pool_exception do
-          Actions.sh("docker run -v $PWD:/root/tests --privileged -t -d #{emulator_args} #{docker_name} #{docker_image}").chomp
+        Actions.sh("docker run -v $PWD:/root/tests --privileged -t -d #{core_amount} #{emulator_args} #{docker_name} #{docker_image}").chomp
+      rescue StandardError => e
+        if e.message =~ /Create more free space in thin pool/ && (retries += 1) < 2
+          prune
+          retry
         end
       end
 
-      def stop_container
-        Actions.sh("docker stop #{container_name}") if container_name
-      end
-
       def delete_container
-        Actions.sh("docker rm #{container_name}") if container_name
+        Actions.sh("docker rm -f #{container_name}") if container_name
+      rescue StandardError
+        sleep 5
+        UI.important("Was not able to delete the container after the first attempt, trying again")
+        retry
       end
 
       def disconnect_network_bridge
+        UI.important('Disconnecting from the network bridge')
         Actions.sh("docker network disconnect -f bridge #{container_name}") if container_name
       rescue StandardError
         # Do nothing if the network bridge is already gone
       end
 
-      def exec(command:)
+      def exec(command:, raise_when_fail: true)
         if container_name
-          Actions.sh("docker exec -i #{container_name} bash -l -c \"#{command}\"")
+          begin
+            Actions.sh("docker exec #{container_name} bash -l -c \"#{command}\"")
+          rescue StandardError => e
+            raise(e) if raise_when_fail
+          end
         else
           raise('Cannot execute docker command because the container name is unknown')
         end
       end
-        
+
       def prune
         Action.sh('docker system prune -f')
       end
-
-      def handle_thin_pool_exception(&block)
-        begin
-          block.call
-        rescue FastlaneCore::Interface::FastlaneShellError => exception
-          retry_counter = retry_counter.to_i + 1
-          if exception.message =~ /Create more free space in thin pool/ && retry_counter < 2
-            prune
-            retry
-          else
-            raise exception
-          end
-        end
-      end
-
     end
   end
-end
+end

data/lib/fastlane/plugin/mango/helper/emulator_commander.rb

@@ -2,9 +2,7 @@ require_relative 'docker_commander'
 
 module Fastlane
   module Helper
-
     class EmulatorCommander
-
       attr_accessor :container_name
 
       def initialize(container_name)
@@ -22,7 +20,7 @@ module Fastlane
         # it recovers after some time, so wait and retry
         retry_counter = retry_counter.to_i + 1
         if retry_counter <= 5
-          sleep 10*retry_counter
+          sleep 10 * retry_counter
           retry
         else
           raise e
@@ -55,7 +53,7 @@ module Fastlane
         # it recovers after some time, so wait and retry
         retry_counter = retry_counter.to_i + 1
         if retry_counter <= 5
-          sleep 10*retry_counter
+          sleep 10 * retry_counter
           retry
         else
           raise e
@@ -63,4 +61,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/plugin/mango/helper/mango_helper.rb

@@ -1,14 +1,13 @@
-require 'docker'
-require 'timeout'
-require 'os'
 require 'net/http'
 require_relative 'docker_commander'
 require_relative 'emulator_commander'
+require_relative 'cpu_load_handler'
 
 module Fastlane
   module Helper
     class MangoHelper
-      attr_reader :container_name, :no_vnc_port, :device_name, :docker_image, :timeout, :port_factor, :maximal_run_time, :sleep_interval, :is_running_on_emulator, :environment_variables
+      attr_reader :container_name, :no_vnc_port, :device_name, :docker_image, :timeout, :port_factor,
+                  :maximal_run_time, :sleep_interval, :is_running_on_emulator, :environment_variables, :vnc_enabled, :core_amount
 
       def initialize(params)
         @container_name = params[:container_name]
@@ -18,6 +17,7 @@ module Fastlane
         @timeout = params[:container_timeout]
         @sdk_path = params[:sdk_path]
         @port_factor = params[:port_factor].to_i
+        @core_amount = params[:core_amount].to_i
         @maximal_run_time = params[:maximal_run_time]
         @sleep_interval = 5
         @container = nil
@@ -27,7 +27,7 @@ module Fastlane
         @docker_registry_login = params[:docker_registry_login]
         @pull_latest_image = params[:pull_latest_image]
         @environment_variables = params[:environment_variables]
-        
+        @vnc_enabled = params[:vnc_enabled]
         @docker_commander = DockerCommander.new(container_name)
         @emulator_commander = EmulatorCommander.new(container_name)
       end
@@ -41,11 +41,11 @@ module Fastlane
         assign_unique_vnc_port if port_factor && is_running_on_emulator
 
         if container_available?
-          @container.stop
-          @container.delete(force: true)
+          UI.important('Container was already started. Stopping and removing..')
+          @docker_commander.delete_container
         end
 
-        handle_ports_allocation if is_running_on_emulator
+        handle_ports_allocation if is_running_on_emulator && vnc_enabled
 
         pull_from_registry if @pull_latest_image
 
@@ -67,13 +67,19 @@ module Fastlane
 
         unless container_state
           UI.important("Will retry to create a healthy docker container after #{sleep_interval} seconds")
-          @container.stop
-          @container.delete(force: true)
+          @docker_commander.delete_container
           sleep @sleep_interval
           create_container
 
           unless wait_for_healthy_container
             UI.important('Container is unhealthy. Exiting..')
+            begin
+              Actions.sh("docker logs #{container_name} --tail 200")
+              Actions.sh("docker exec -i #{container_name} cat /var/log/supervisor/docker-android.stderr.log")
+              Actions.sh("docker exec -i #{container_name} cat /var/log/supervisor/supervisord.log")
+            rescue StandardError
+              # do nothing
+            end
             # We use code "2" as we need something than just standard error code 1, so we can differentiate the next step in CI
             exit 2
           end
@@ -101,12 +107,6 @@ module Fastlane
         @docker_commander.exec(command: 'cat kvm-ok.txt').include?('KVM acceleration can NOT be used')
       end
 
-      # Stops and remove container
-      def clean_container
-        @container.stop
-        @container.delete(force: true)
-      end
-
       private
 
       # Sets path to adb
@@ -117,7 +117,7 @@ module Fastlane
       # assigns vnc port
       def assign_unique_vnc_port
         @no_vnc_port = 6080 + port_factor
-        @host_ip_address = `hostname -I | head -n1 | awk '{print $1;}'`.delete!("\n")
+        @host_ip_address = `hostname -i | head -n1 | awk '{print $1;}'`.delete!("\n")
         UI.success("Port: #{@no_vnc_port} was chosen for VNC")
         UI.success("Link to VNC: http://#{@host_ip_address}:#{@no_vnc_port}")
       end
@@ -125,46 +125,46 @@ module Fastlane
       # Creates new container using params
       def create_container
         UI.important("Creating container: #{container_name}")
-        print_cpu_load
+        CpuLoadHandler.print_cpu_load
         begin
           container = create_container_call
           set_container_name(container)
         rescue StandardError
           UI.important("Something went wrong while creating: #{container_name}, will retry in #{@sleep_interval} seconds")
-          print_cpu_load
-          @docker_commander.stop_container
+          CpuLoadHandler.print_cpu_load
           @docker_commander.delete_container
-          
           sleep @sleep_interval
           container = create_container_call
           set_container_name(container)
         end
-        get_container_instance(container)
+        @container = get_container_instance(container)
+
+        if @container.nil?
+          sleep 3
+          @container = get_container_instance(container)
+        end
       end
 
       # Gets container instance by container ID
       def get_container_instance(container)
         Docker::Container.all(all: true).each do |cont|
-          if cont.id == container
-            @container = cont
-            break
-          end
+          return cont if cont.id == container
         end
       end
 
       # Call to create a container. We don't use Docker API here, as it doesn't support --privileged.
       def create_container_call
         # When CPU is under load we cannot create a healthy container
-        wait_cpu_to_idle
+        CpuLoadHandler.wait_cpu_to_idle
 
         additional_env = ''
         environment_variables.each do |variable|
-          additional_env = additional_env + " -e #{variable}"
+          additional_env += " -e #{variable}"
         end
         emulator_args = is_running_on_emulator ? "-p #{no_vnc_port}:6080 -e DEVICE='#{device_name}'" : ''
         emulator_args = "#{emulator_args}#{additional_env}"
-        
-        @docker_commander.start_container(emulator_args: emulator_args, docker_image: docker_image)
+        @docker_commander.start_container(emulator_args: emulator_args, docker_image: docker_image,
+                                          core_amount: core_amount)
       end
 
       def execute_pre_action
@@ -173,6 +173,7 @@ module Fastlane
 
       # Pull the docker images before creating a container
       def pull_from_registry
+        UI.important('Pulling the :latest image from the registry')
         docker_image_name = docker_image.gsub(':latest', '')
         Actions.sh(@docker_registry_login) if @docker_registry_login
         @docker_commander.pull_image(docker_image_name: docker_image_name)
@@ -189,7 +190,6 @@ module Fastlane
         if port_open?('0.0.0.0', @no_vnc_port)
           UI.important('Something went wrong. VNC port is still busy')
           sleep @sleep_interval
-          @docker_commander.stop_container
           @docker_commander.delete_container
         end
       end
@@ -203,13 +203,10 @@ module Fastlane
         nil
       end
 
-      def print_cpu_load(load = cpu_load)
-        UI.important("CPU load is: #{load}")
-      end
-
       # Checks if container is already available
       def container_available?
         return false unless container_name
+
         all_containers = Docker::Container.all(all: true)
 
         all_containers.each do |container|
@@ -252,6 +249,9 @@ module Fastlane
         end
         UI.important("The Container failed to load after '#{timeout}' seconds timeout. Reason: '#{@container.json['State']['Status']}'")
         false
+      rescue StandardError => e
+        puts e
+        false
       end
 
       # Checks if port is already openZ
@@ -263,41 +263,12 @@ module Fastlane
         false
       end
 
-      # Gets load average of Linux machine
-      def cpu_load
-        load = `cat /proc/loadavg`
-        load.split(' ').first.to_f
-      end
-
-      # Gets amount of the CPU cores
-      def cpu_core_amount
-        `cat /proc/cpuinfo | awk '/^processor/{print $3}' | tail -1`
-      end
-
-      # For half an hour waiting until CPU load average is less than number of cores*2 (which considers that CPU is ready)
-      # Raises when 30 minutes timeout exceeds
-      def wait_cpu_to_idle
-        if OS.linux?
-          30.times do
-            load = cpu_load
-            return true if load < cpu_core_amount.to_i * 1.5
-            print_cpu_load(load)
-            UI.important('Waiting for available resources..')
-            sleep 60
-          end
-        else
-          return true
-        end
-        raise "CPU was overloaded. Couldn't start emulator"
-      end
-
       # if we do not have container name, we cane use container ID that we got from create call
       def set_container_name(container)
         unless container_name
           @container_name = @emulator_commander.container_name = @docker_commander.container_name = container
         end
       end
-
     end
   end
 end

data/lib/fastlane/plugin/mango/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Mango
-    VERSION = '1.1.6'.freeze
+    VERSION = '1.3.25'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-mango
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.3.25
 platform: ruby
 authors:
 - Serghei Moret, Daniel Hartwich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -112,16 +112,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: serghei.moret@xing.com, hartwich.daniel@gmail.com
 executables: []
 extensions: []
@@ -146,6 +146,7 @@ files:
 - README.md
 - lib/fastlane/plugin/mango.rb
 - lib/fastlane/plugin/mango/actions/run_dockerized_task_action.rb
+- lib/fastlane/plugin/mango/helper/cpu_load_handler.rb
 - lib/fastlane/plugin/mango/helper/docker_commander.rb
 - lib/fastlane/plugin/mango/helper/emulator_commander.rb
 - lib/fastlane/plugin/mango/helper/mango_helper.rb
@@ -154,7 +155,7 @@ homepage: https://github.com/xing/mango
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,9 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
-summary: This plugin Android tasks on docker images
+summary: This plugin orchtestrates Android tasks on docker images
 test_files: []