Fix issue when replacing arguments with circleci env subst (#105)

* Extra test with args

* Add debug to new test

* Fix shell

* Add shell to executor

* update the way the subst is done on scripts

* Do the substitution in a more explicit way

* remove debug

Author: marboledacci

.circleci/test-deploy.yml

@@ -130,6 +130,10 @@ jobs:
       tag:
         type: string
         description: "Android machine image tag to use."
+      args:
+        type: string
+        default: ""
+        description: Additional args to pass to avd creation
     executor:
       name: android/android_machine
       tag: << parameters.tag >>
@@ -148,6 +152,7 @@ jobs:
             - android/restore_build_cache
             - run: cd compose-samples/Jetchat && ./gradlew assembleDebugAndroidTest
           post_emulator_launch_assemble_command: ""
+          additional_avd_args: <<parameters.args>>
           run_tests_working_directory: ./compose-samples/Jetchat
           post_run_tests_steps:
             - android/save_build_cache
@@ -272,7 +277,13 @@ workflows:
       #     tag: "default"
       #     filters: *filters
       - test_start_emulator_and_run_tests:
+          name: test_start_emulator_and_run_tests
+          tag: "default"
+          filters: *filters
+      - test_start_emulator_and_run_tests:
+          name: test_start_emulator_and_run_tests-with-args
           tag: "default"
+          args: -d pixel_6
           filters: *filters
       - test-fastlane
       - orb-tools/pack:

src/scripts/create_avd.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-PARAM_AVD_NAME="$(circleci env subst "$PARAM_AVD_NAME")"
-PARAM_SYSTEM_IMAGE="$(circleci env subst "$PARAM_SYSTEM_IMAGE")"
-PARAM_ADDITIONAL_ARGS="$(circleci env subst "$PARAM_ADDITIONAL_ARGS")"
+PARAM_AVD_NAME="$(echo "$PARAM_AVD_NAME" | circleci env subst "$PARAM_AVD_NAME")"
+PARAM_SYSTEM_IMAGE="$(echo "$PARAM_SYSTEM_IMAGE" | circleci env subst "$PARAM_SYSTEM_IMAGE")"
+PARAM_ADDITIONAL_ARGS="$(circleci env subst -- "$PARAM_ADDITIONAL_ARGS")"
 
 if [ "${PARAM_INSTALL}" == 1 ]; then
     sdkmanager "${PARAM_SYSTEM_IMAGE}"

src/scripts/run_tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-PARAM_PRE_TEST_COMMAND="$(circleci env subst "$PARAM_PRE_TEST_COMMAND")"
-PARAM_TEST_COMMAND="$(circleci env subst "$PARAM_TEST_COMMAND")"
+PARAM_PRE_TEST_COMMAND="$(echo "$PARAM_PRE_TEST_COMMAND" | circleci env subst "$PARAM_PRE_TEST_COMMAND")"
+PARAM_TEST_COMMAND="$(echo "$PARAM_TEST_COMMAND" | circleci env subst "$PARAM_TEST_COMMAND")"
 
 run_with_retry() {
   MAX_TRIES=${PARAM_MAX_TRIES}