Merge pull request #7 from MarathonLabs/ios_support

ios support
MarathonLabs · Jun 26, 2023 · 52b139f · 52b139f
2 parents 116c240 + e76e7c9
commit 52b139f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 4 deletions.
diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml
@@ -35,6 +35,7 @@ jobs:
  # apiKeyEnvVar: MARATHON_CLOUD_API_TOKEN
  # application: app.apk
  # testApplication: appTest.apk
+ # platform: Android
  print-help-test:
  executor: marathon-cloud-orb/default
  steps:

diff --git a/src/commands/run_tests.yml b/src/commands/run_tests.yml
@@ -8,11 +8,15 @@ parameters:
  application:
  type: string
  description: >
- Application binary path, e.g. apk file for Android
+ Application binary path, e.g. apk file for Android or zip file of iOS Application
  testApplication:
  type: string
  description: >
- Test application binary path, e.g. apk file for Android
+ Test application binary path, e.g. apk file for Android or zip file of iOS Test Runner app
+ platform:
+ type: string
+ description: >
+ Testing platform. Android or iOS only
  output:
  type: string
  default: "marathon"
@@ -24,5 +28,6 @@ steps:
  ORB_API_KEY_ENV_VAR: <<parameters.apiKeyEnvVar>>
  ORB_APPLICATION: <<parameters.application>>
  ORB_TEST_APPLICATION: <<parameters.testApplication>>
+ ORB_PLATFORM: <<parameters.platform>>
  ORB_OUTPUT: <<parameters.output>>
  command: <<include(scripts/run-tests.sh)>>
diff --git a/src/examples/example.yml → src/examples/example_android.yml b/src/examples/example.yml → src/examples/example_android.yml
@@ -12,6 +12,7 @@ usage:
  apiKeyEnvVar: MARATHON_CLOUD_API_TOKEN # don't forget to add a token
  application: app/build/outputs/apk/debug/app-debug.apk
  testApplication: app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
+ platform: Android
  workflows:
  marathon-cloud-orb-example:
  jobs:

diff --git a/src/examples/example_ios.yaml b/src/examples/example_ios.yaml
@@ -0,0 +1,19 @@
+description: >
+ Run a job inside the marathon-cloud cli container, via this orb's executor.
+usage:
+ version: 2.1
+ orbs:
+ marathon-cloud: marathonlabs/[email protected]
+ jobs:
+ run-tests-using-marathon-cloud:
+ executor: marathon-cloud/default
+ steps:
+ - marathon-cloud/run_tests:
+ apiKeyEnvVar: MARATHON_CLOUD_API_TOKEN # don't forget to add a token
+ application: /home/user/workspace/sample.zip
+ testApplication: /home/user/workspace/sampleUITests-Runner.zip
+ platform: iOS
+ workflows:
+ marathon-cloud-orb-example:
+ jobs:
+ - run-tests-using-marathon-cloud
diff --git a/src/executors/default.yml b/src/executors/default.yml
@@ -4,7 +4,7 @@ docker:
  - image: 'marathonlabs/marathon-cloud:<<parameters.tag>>'
 parameters:
  tag:
- default: 0.1.2
+ default: 0.2.0
  description: >
  Pick a specific marathonlabs/marathon-cloud image variant:
  https://hub.docker.com/r/marathonlabs/marathon-cloud/tags

diff --git a/src/scripts/run-tests.sh b/src/scripts/run-tests.sh
@@ -2,4 +2,4 @@
 
 API_KEY=$(eval echo \$"$ORB_API_KEY_ENV_VAR")
 
-marathon-cloud -api-key "$API_KEY" -apk "$ORB_APPLICATION" -testapk "$ORB_TEST_APPLICATION" -o "$ORB_OUTPUT"
+marathon-cloud -api-key "$API_KEY" -app "$ORB_APPLICATION" -testapp "$ORB_TEST_APPLICATION" -o "$ORB_OUTPUT" -platform "$ORB_PLATFORM"