Combine both run-cats tasks into one

- use an optional input to allow users to provide their own CF CLI if
desired
- the old run-cats-with-provided-cli task is symlinked to avoid a
breaking change

Author: davewalter

README.md

@@ -141,10 +141,8 @@ wins.
 ### [run-cats][run-cats-task-yaml]
 This runs [CF Acceptance Tests](https://github.com/cloudfoundry/cf-acceptance-tests)
 against a CF environment specified by the CATs integration file.
-
-### [run-cats-with-provided-cli][run-cats-with-provided-cli-task-yaml]
-This runs [CF Acceptance Tests](https://github.com/cloudfoundry/cf-acceptance-tests)
-with the provided CF CLI binary.
+If desired, you can use the optional cf-cli input to provide your own CF CLI
+binary.
 
 ### [run-errand][run-errand-yaml]
 This runs a bosh errand
@@ -182,7 +180,6 @@ instance groups.
 [deployment-guide-on-certificates]: https://github.com/cloudfoundry/cf-deployment/blob/develop/deployment-guide.md#on-certificates
 [issues-page]: https://github.com/cloudfoundry/cf-deployment-concourse-tasks/issues
 [run-cats-task-yaml]: run-cats/task.yml
-[run-cats-with-provided-cli-task-yaml]: run-cats-with-provided-cli/task.yml
 [run-errand-yaml]: run-errand/task.yml
 [runtime-ci-build-docker-images]: https://runtime.ci.cf-app.com/teams/main/pipelines/build-docker-images?groups=cf-deployment-concourse-tasks
 [set-feature-flags-task-yaml]: set-feature-flags/task.yml

run-cats-with-provided-cli

@@ -0,0 +1 @@
+run-cats

run-cats-with-provided-cli/task

@@ -3,6 +3,12 @@ set -xeu
 
 build_dir=${PWD}
 
+if [[ -d "${build_dir}/cf-cli" ]]; then
+  echo "Setting PATH so that input cf-cli is found by CATs..."
+  PATH="${build_dir}/cf-cli:${PATH}"
+  export PATH
+fi
+
 export CONFIG
 CONFIG=$(mktemp)
 

run-cats-with-provided-cli/task.yml

@@ -11,6 +11,9 @@ inputs:
 - name: cf-deployment-concourse-tasks
 - name: cf-acceptance-tests
 - name: integration-config
+- name: cf-cli
+  optional: true
+# - Input to run your own cf-cli binary
 
 outputs:
 - name: cats-trace-output