Bug fixes pr 1.x (#720)

* Fixing errors caused by missing variable in when clause.

* Making testing roles default to live_symlink_dest instead of deploy_path, in case of track file problems.

* Updating docs.

Author: gregharvey

docs/roles/_init.md

@@ -23,6 +23,7 @@ lock_file: /tmp/ce-deploy-lock
 provision_lock_file: /tmp/ce-provision-lock # must match _init.lock_file in ce-provision
 skip_build_path_check: false # by default we're checking if track number matches
 keep_builds: 10  # the number of builds to keep in the build history, includes associated databases
+build_cleanup_pattern: "{{ project_name }}_{{ build_type }}_build_*" # name pattern of the builds to be checked for cleanup
 # Application specific variables.
 drupal:
   drush_verbose_output: false

docs/roles/tests/tests_behat.md

@@ -14,13 +14,13 @@ behat:
   verbose: false        # set to true for verbose output
   fail_builds: true     # set to false if you do not want Ansible to stop if Behat tests fail
   show_results: true    # if `fail_builds: false` then show_results allows us to optionally show Behat test results in the Ansible output
-  bin: "{{ deploy_path }}/vendor/bin/behat"  # location of Behat
+  bin: "{{ live_symlink_dest }}/vendor/bin/behat"  # location of Behat
   # List of outputs to create, defaults to 'pretty' to STDOUT
   outputs:
     - format: pretty  # options are pretty, progress or junit
       output: std     # see docs for more information, supports output filepath or various formats
-  config_file: "{{ deploy_path }}/tests/behat/behat.yml"  # path to config file
-  working_dir: "{{ deploy_path }}"  # path to execute composer from
+  config_file: "{{ live_symlink_dest }}/tests/behat/behat.yml"  # path to config file
+  working_dir: "{{ live_symlink_dest }}"  # path to execute composer from
 
 ```
 

docs/roles/tests/tests_diffy.md

@@ -27,8 +27,8 @@ diffy:
   main_env: dev   # name of the 'good' environment to compare against (must be pre-configured in diffy)
   test_env: custom  # name of the environment to be compared (usually diffy's default 'custom' environment)
   test_env_url: ""  # set a base URL to use against the diffy 'custom' environment
-  bin: "{{ deploy_path }}/vendor/bin/diffy"  # location of diffy
-  working_dir: "{{ deploy_path }}"  # path to execute composer and related binaries from
+  bin: "{{ live_symlink_dest }}/vendor/bin/diffy"  # location of diffy
+  working_dir: "{{ live_symlink_dest }}"  # path to execute composer and related binaries from
 
 ```
 

docs/roles/tests/tests_phpcs.md

@@ -61,11 +61,11 @@ See the installation documentation on packagist: https://packagist.org/packages/
 phpcs:
   install: false               # set to true if you want ce-deploy to attempt to composer install PHP CodeSniffer
   install_drupal_coder: false  # set to true to install the Coder module for Drupal, which provides a Drupal standard for CodeSniffer
-  bin: "{{ deploy_path }}/vendor/bin/phpcs"  # location of phpcs
+  bin: "{{ live_symlink_dest }}/vendor/bin/phpcs"  # location of phpcs
   standard: ""    # optionally set the path to an installed standard, for example "vendor/drupal/coder/coder_sniffer/Drupal" for the Coder module for Drupal
   extensions: ""  # set optional extensions, for example for Drupal you could set "php,module,inc,theme,install" - defaults to "php,inc/php,js,css"
   test_paths: []  # list of paths to test against
-  working_dir: "{{ deploy_path }}"  # path to execute composer from
+  working_dir: "{{ live_symlink_dest }}"  # path to execute composer from
 
 ```
 

docs/roles/tests/tests_phpunit.md

@@ -32,9 +32,9 @@ phpunit:
   install: false # set to true if you want ce-deploy to attempt to composer install phpunit
   group: unit # comma separated list of group names to run
   target: ../modules # directory or file to test, defaults to Drupal's modules directory
-  bin: "{{ deploy_path }}/vendor/bin/phpunit" # location of phpunit
-  tests_path: "{{ deploy_path }}/{{ webroot }}/core" # directory containing the PHPUnit 'tests' directory, defaults to Drupal's core directory
-  working_dir: "{{ deploy_path }}"  # path to execute composer from
+  bin: "{{ live_symlink_dest }}/vendor/bin/phpunit" # location of phpunit
+  tests_path: "{{ live_symlink_dest }}/{{ webroot }}/core" # directory containing the PHPUnit 'tests' directory, defaults to Drupal's core directory
+  working_dir: "{{ live_symlink_dest }}"  # path to execute composer from
 
 ```
 

roles/_init/README.md

@@ -23,6 +23,7 @@ lock_file: /tmp/ce-deploy-lock
 provision_lock_file: /tmp/ce-provision-lock # must match _init.lock_file in ce-provision
 skip_build_path_check: false # by default we're checking if track number matches
 keep_builds: 10  # the number of builds to keep in the build history, includes associated databases
+build_cleanup_pattern: "{{ project_name }}_{{ build_type }}_build_*" # name pattern of the builds to be checked for cleanup
 # Application specific variables.
 drupal:
   drush_verbose_output: false

roles/tests/tests_behat/README.md

@@ -14,13 +14,13 @@ behat:
   verbose: false        # set to true for verbose output
   fail_builds: true     # set to false if you do not want Ansible to stop if Behat tests fail
   show_results: true    # if `fail_builds: false` then show_results allows us to optionally show Behat test results in the Ansible output
-  bin: "{{ deploy_path }}/vendor/bin/behat"  # location of Behat
+  bin: "{{ live_symlink_dest }}/vendor/bin/behat"  # location of Behat
   # List of outputs to create, defaults to 'pretty' to STDOUT
   outputs:
     - format: pretty  # options are pretty, progress or junit
       output: std     # see docs for more information, supports output filepath or various formats
-  config_file: "{{ deploy_path }}/tests/behat/behat.yml"  # path to config file
-  working_dir: "{{ deploy_path }}"  # path to execute composer from
+  config_file: "{{ live_symlink_dest }}/tests/behat/behat.yml"  # path to config file
+  working_dir: "{{ live_symlink_dest }}"  # path to execute composer from
 
 ```
 

roles/tests/tests_behat/defaults/main.yml

@@ -5,10 +5,10 @@ behat:
   verbose: false        # set to true for verbose output
   fail_builds: true     # set to false if you do not want Ansible to stop if Behat tests fail
   show_results: true    # if `fail_builds: false` then show_results allows us to optionally show Behat test results in the Ansible output
-  bin: "{{ deploy_path }}/vendor/bin/behat"  # location of Behat
+  bin: "{{ live_symlink_dest }}/vendor/bin/behat"  # location of Behat
   # List of outputs to create, defaults to 'pretty' to STDOUT
   outputs:
     - format: pretty  # options are pretty, progress or junit
       output: std     # see docs for more information, supports output filepath or various formats
-  config_file: "{{ deploy_path }}/tests/behat/behat.yml"  # path to config file
-  working_dir: "{{ deploy_path }}"  # path to execute composer from
+  config_file: "{{ live_symlink_dest }}/tests/behat/behat.yml"  # path to config file
+  working_dir: "{{ live_symlink_dest }}"  # path to execute composer from

roles/tests/tests_diffy/README.md

@@ -27,8 +27,8 @@ diffy:
   main_env: dev   # name of the 'good' environment to compare against (must be pre-configured in diffy)
   test_env: custom  # name of the environment to be compared (usually diffy's default 'custom' environment)
   test_env_url: ""  # set a base URL to use against the diffy 'custom' environment
-  bin: "{{ deploy_path }}/vendor/bin/diffy"  # location of diffy
-  working_dir: "{{ deploy_path }}"  # path to execute composer and related binaries from
+  bin: "{{ live_symlink_dest }}/vendor/bin/diffy"  # location of diffy
+  working_dir: "{{ live_symlink_dest }}"  # path to execute composer and related binaries from
 
 ```
 

roles/tests/tests_diffy/defaults/main.yml

@@ -6,5 +6,5 @@ diffy:
   main_env: dev   # name of the 'good' environment to compare against (must be pre-configured in diffy)
   test_env: custom  # name of the environment to be compared (usually diffy's default 'custom' environment)
   test_env_url: ""  # set a base URL to use against the diffy 'custom' environment
-  bin: "{{ deploy_path }}/vendor/bin/diffy"  # location of diffy
-  working_dir: "{{ deploy_path }}"  # path to execute composer and related binaries from
+  bin: "{{ live_symlink_dest }}/vendor/bin/diffy"  # location of diffy
+  working_dir: "{{ live_symlink_dest }}"  # path to execute composer and related binaries from