Make all $HELIX_ env vars available in Apple workloads (#7869)

Author: premun

src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.apple.sh

@@ -28,13 +28,13 @@ set -x
 # It is important we call the script via `launchctl asuser` in order to be able to spawn
 # the simulator which needs to run in a user session with GUI rendering capabilities.
 # The problem with launchctl is that the spawned process won't share environment variables
-# so we have to pass all of them as parameters are set them again.
+# so we have to set them again.
+export -p > envvars
 chmod +x xharness-runner.apple.sh
 helix_runner_uid=$(id -u)
 sudo launchctl asuser "$helix_runner_uid" sh ./xharness-runner.apple.sh \
     $forwarded_args                                                     \
     --app "$HELIX_WORKITEM_ROOT/$app"                                   \
-    --xharness-cli-path "$XHARNESS_CLI_PATH"                            \
     --output-directory "$HELIX_WORKITEM_UPLOAD_ROOT"                    \
     --diagnostics-path "$XHARNESS_DIAGNOSTICS_PATH"                     \
 

src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.apple.sh

@@ -7,11 +7,9 @@
 ###
 
 app=''
-output_directory=''
 target=''
 timeout=''
 launch_timeout=''
-xharness_cli_path=''
 xcode_version=''
 app_arguments=''
 expected_exit_code=0
@@ -25,10 +23,6 @@ while [[ $# -gt 0 ]]; do
         app="$2"
         shift
         ;;
-      --output-directory)
-        output_directory="$2"
-        shift
-        ;;
       --diagnostics-path)
         export XHARNESS_DIAGNOSTICS_PATH="$2"
         shift
@@ -45,10 +39,6 @@ while [[ $# -gt 0 ]]; do
         launch_timeout="$2"
         shift
         ;;
-      --xharness-cli-path)
-        xharness_cli_path="$2"
-        shift
-        ;;
       --xcode-version)
         xcode_version="$2"
         shift
@@ -85,20 +75,18 @@ if [ -z "$target" ]; then
     die "No target was provided";
 fi
 
-if [ -z "$output_directory" ]; then
-    die "No output directory provided";
-fi
-
-if [ -z "$xharness_cli_path" ]; then
-    die "XHarness path wasn't provided";
-fi
-
 if [ -z "$xcode_version" ]; then
     xcode_path="$(dirname "$(dirname "$(xcode-select -p)")")"
 else
     xcode_path="/Applications/Xcode${xcode_version/./}.app"
 fi
 
+# First we need to revive env variables since they were erased by launchctl
+# This file already has the expressions in the `export name=value` format
+. ./envvars
+
+output_directory=$HELIX_WORKITEM_UPLOAD_ROOT
+
 # Signing
 if [ "$target" == 'ios-device' ] || [ "$target" == 'tvos-device' ]; then
     echo "Real device target detected, application will be signed"
@@ -141,12 +129,9 @@ elif [[ "$target" =~ "simulator" ]]; then
     open -a "$simulator_app"
 fi
 
-export XHARNESS_DISABLE_COLORED_OUTPUT=true
-export XHARNESS_LOG_WITH_TIMESTAMPS=true
-
 # The xharness alias
 function xharness() {
-    dotnet exec $xharness_cli_path "$@"
+    dotnet exec $XHARNESS_CLI_PATH "$@"
 }
 
 # Act out the actual commands