department-of-veterans-affairs · jonpugh · Mar 23, 2020 · Mar 23, 2020 · Mar 23, 2020 · Mar 23, 2020
diff --git a/.env.lando b/.env.lando
@@ -12,7 +12,7 @@
 # Used by WEB build process.
 DRUPAL_ADDRESS=http://va-gov-cms.lndo.site
 
-# Tells composer yaml-tests command not to format process in blocks, but print directly.
+# Tells composer yaml-tasks command not to format process in blocks, but print directly.
 PROVISION_PROCESS_OUTPUT=direct
 
 # Used by behat tests.

diff --git a/.hooks.yml b/.hooks.yml
@@ -1,11 +1,10 @@
 # This file is needed for us to customize what devshop does.
 #
-# It can be removed once devshop supports yaml-tests natively.
+# It can be removed once devshop supports yaml-tasks natively.
 
 deploy: |
-# @TODO: Change this to a yaml-tests call with a filter for "va/deploy", once global yaml tests
-#  composer yaml-tests --tests-file=deploy.yml --ansi
+# @TODO: Change this to a yaml-tasks call with a filter for "va/deploy", once global yaml tasks
+#  composer yaml-tasks --tasks-file=deploy.yml --ansi
 
 test: |
-  echo "Running `composer yaml-tests` on tests.yml..."
-  composer yaml-tests --tests-file=tests.yml --ansi
+  bin/yaml-tasks --ansi --ignore-ssl --tasks-file=tasks.yml
diff --git a/.lando.yml b/.lando.yml
@@ -6,7 +6,7 @@ config:
 
 events:
   post-db-import:
-    # @TODO: Change to `composer yaml-tests va/deploy` once the "filter argument" feature is in place.
+    # @TODO: Change to `composer yaml-tasks va/deploy` once the "filter argument" feature is in place.
     - appserver: cd $LANDO_WEBROOT && /app/bin/drush cache-rebuild -y
     - appserver: cd $LANDO_WEBROOT && /app/bin/drush updatedb -y
     - appserver: cd $LANDO_WEBROOT && /app/bin/drush cache-rebuild -y
@@ -20,7 +20,7 @@ events:
   # After code changes
   post-update:
     - appserver: cd $LANDO_MOUNT && composer install
-    - appserver: cd $LANDO_WEBROOT && drush updb -y &&  drush cr -y
+    - appserver: cd $LANDO_WEBROOT && drush updateb -y &&  drush cache:rebuild -y
 
 services:
   appserver:
@@ -76,9 +76,9 @@ tooling:
     cmd: cp -r /app/docroot/modules/custom/va_gov_migrate/config/install/. /app/config/sync/  && drush config-import --partial --source=/app/docroot/modules/custom/va_gov_migrate/config/install/
 
   test:
-    description: Run all VA.gov tests, as defined in tests.yml. Add arguments to run subsets of tests. For example. "lando test deploy" will run all of the "va/deploy/*" tests.
+    description: Run all VA.gov tests, as defined in tasks.yml. Add arguments to run subsets of tasks. For example. "lando test deploy" will run all of the "va/deploy/*" tasks.
     service: appserver
-    cmd: composer yaml-tests
+    cmd: composer yaml-tasks
 
   # "drush" being here overrides the default "lando drush" command.
   # Using /app/bin/drush means we are using the site-local drush directly.
@@ -107,7 +107,7 @@ tooling:
   phpunit:
     service: appserver
     description: "Run PHP Unit tests: lando phpunit. Syntax: lando phpunit {PATH-TO-TEST}"
-    cmd: "composer yaml-tests va/tests/phpunit"
+    cmd: "composer yaml-tasks va/tests/phpunit"
 
   behat:
     service: appserver
@@ -117,7 +117,7 @@ tooling:
   test_filter_test:
     service: appserver
     description: "Run this command to see the strange problem where `lando test behat` does not work."
-    cmd: "composer yaml-tests va/tests/behat"
+    cmd: "composer yaml-tasks va/tests/behat"
 
   # NPM and NODE are now installed via composer install: this ensures version consistency.
   npm:

diff --git a/READMES/environment-variables.md b/READMES/environment-variables.md
@@ -13,12 +13,12 @@ Any existing environment variables will be overwritten if the same variable exis
 Using a `.env` file instead on relying on the server environment has many benefits: 
 
  - When the Composer autoloader is forced to use the `.env`, all of tools that use it will have the exact
-   same environment. This includes Drupal itself, and everything in the [.bin folder](../bin): `drush`, `phpunit`, `behat`, `yaml-tests`, `etc`. 
+   same environment. This includes Drupal itself, and everything in the [.bin folder](../bin): `drush`, `phpunit`, `behat`, `yaml-tasks`, `etc`. 
  - No need to write variables to server configuration.
  - No need to pass variables through docker, docker-compose, Dockerfiles, etc.
  - No need to worry about the execution environment: 
    - Every system (local, CI, BRD, etc) has it's way of loading the "execution environment" for running processes. 
-   - In other words, commands like `drush cache-rebuild` or `composer yaml-tests` are run by the `apache` user in BRD,
+   - In other words, commands like `drush cache-rebuild` or `composer yaml-tasks` are run by the `apache` user in BRD,
      the `aegir` user in CMS-CI, and the `www-data` user in Lando.
    - By using a single `.env` file for all environments, we no longer have to maintain scripts to set system-specific
      environment variables. 

diff --git a/READMES/testing.md b/READMES/testing.md
@@ -3,13 +3,40 @@
 The code for cms.VA.gov undergoes numerous tests before merging, and tests
 are run before deployment and release.
 
-The automated test suite for cms.VA.gov is defined in the [tests.yml](../tests.yml)
- file and is run using the [Yaml-Tests](https://github.com/provision-ops/yaml-tests) tool, allowing the same command to be used local development, in CMS
+The automated test suite for cms.VA.gov is defined in the [tasks.yml](../tasks.yml)
+ file and is run using the [Yaml Tasks](https://github.com/devshop-packages/yaml-tasks) tool, allowing the same command to be used local development, in CMS
  -CI and for production releases.
 
-The *Yaml Tests* Composer plugin is required by the main va.gov-cms
+The *Yaml Tasks* Composer plugin is required by the main va.gov-cms
 `composer.json` file.
 
+## Deployment vs Testing Tasks
+
+The tasks.yml file contains everything that needs to be run to *test* a copy of the CMS.
+
+In order to be sure code will work in production, this includes what are considered *deployment* tasks: Cache rebuild, config import, update database (listed below).
+
+The YamlTasks plugin was designed to be both a testing and deployment tool. To support this, you can use an argument after the `yaml-tasks` command to only run a subset of the tasks listed.
+
+By keeping a single file for all tasks, developers and operators can be sure that the exact same steps ran during CI and during the production deployment.
+
+For example, `tasks.yml` includes all steps to deploy *and* test the site:
+
+    va/tests/phpcs: bin/phpcs
+    va/deploy/0-composer: composer install
+    va/deploy/1-cache: drush cache-rebuild
+    va/deploy/2-update: drush update-db
+    va/deploy/3-config: drush config-import
+    va/tests/behat: bin/behat
+
+Then, the *testing* script can be `composer yaml-tasks` to run all tasks, and the "production deployment" script can be
+`composer yaml-tests va/deploy` to only run the test that begin with `va/deploy`.
-`composer yaml-tests va/deploy` to only run the test that begin with `va/deploy`.
+`composer yaml-tasks va/deploy` to only run the test that begin with `va/deploy`.
-`composer yaml-tests va/deploy` to only run the test that begin with `va/deploy`.
+`composer yaml-tasks va/deploy` to only run the test that begin with `va/deploy`.
+
+By keeping a single tasks.yml file you don't have to maintain copies of the list of commands to run in different places: such as in ansible scripts, the va.gov-cms repo's lando.yml, etc.
+
+This reduces chances of instability since the "site rebuild" command is the same, every time, even if the command set changes in the future.
+
+
 ## Goals
 
 To adopt a strong test driven culture, the testing tools must:
@@ -131,24 +158,24 @@ There are 4 main types of tests:
 
 ## Running Tests
 
-The main way to run Yaml-tests is the `composer yaml-tests` command.
+The main way to run Yaml-tasks is the `composer yaml-tasks` command.
 
-Run `composer yaml-tests --help` for more information.
+Run `composer yaml-tasks --help` for more information.
 
-### Composer Command:  `composer yaml-tests`
+### Composer Command:  `composer yaml-tasks`
 
 All composer commands can be shortened to any unique string, so `composer y
-` is an alias for `composer yaml-tests`.
+` is an alias for `composer yaml-tasks`.
 
 Run `composer y --help` to see more options.
 
-### Bin dir executable: `./bin/yaml-tests`
+### Bin dir executable: `./bin/yaml-tasks`
 
-There is a `bin/yaml-tests` file provided with this package. You can run it
+There is a `bin/yaml-tasks` file provided with this package. You can run it
  from the project root.
 
 *NOTE: The `bin` directory is automatically included in the $PATH for all
- Composer commands, including yaml-tests itself.*
+ Composer commands, including yaml-tasks itself.*
 
   See [Composer Paths](#composer-configbinpath-and-path) for more information
    on Composer and $PATH.
@@ -163,10 +190,10 @@ Lando commands are listed in [`.lando.yml`](../.lando.yml). There are some
 
  | Lando Command        | Composer Command
  |--------------        |----------------
- |lando test            | composer yaml-tests
- |lando test va/deploy  | composer yaml-tests va/deploy
+ |lando test            | composer yaml-tasks
+ |lando test va/deploy  | composer yaml-tasks va/deploy
  |lando web-build       | composer va:web:build
- |lando phpunit         | composer yaml-tests  va/tests/phpunit
+ |lando phpunit         | composer yaml-tasks  va/tests/phpunit
  |lando web-build       | composer va:web:build
  |lando behat           | cd /app/tests/behat && /app/bin/behat
 
@@ -176,27 +203,27 @@ Lando commands are listed in [`.lando.yml`](../.lando.yml). There are some
   - Any Composer command can be run inside a Lando container after you call
    `lando ssh`.
 
-@TODO: Standardize this mapping on Yaml-tests. It will continue to improve
+@TODO: Standardize this mapping on Yaml-tasks. It will continue to improve
  with features like timing, profiling, output logging, etc.
 
 ### Limit tests to run
 You can add an argument to filter the tests to run:
 
  ```sh
  # Run the entire test suite.
- composer yaml-tests
+ composer yaml-tasks
 
  # Run `va/tests/phpunit` only
- composer yaml-tests phpunit
+ composer yaml-tasks phpunit
 
  # Run all `va/deploy/*` tests.
- composer yaml-tests va/deploy
+ composer yaml-tasks va/deploy
  ```
 
 
 ## GitHub Integration
 
-The Yaml-Tests tool also integrates with GitHub, providing pass/fail commit
+The Yaml-tasks tool also integrates with GitHub, providing pass/fail commit
  status for each test listed in `tests.yml`, and posting errors as comments
   on the commit's page on GitHub.com.
 
@@ -219,7 +246,7 @@ The API used by Yaml Tests and GitHub for testing code is called the
 
 It stores test results attached to the commit, based on SHA.
 
-Yaml-tests reads the SHA of git repository, runs the test, and sends the state
+Yaml-tasks reads the SHA of git repository, runs the test, and sends the state
 to GitHub Status API, which sends it along to the users.
 
 What you end up seeing is something like this:
@@ -243,15 +270,15 @@ if you open a second PR with the same commits, the commit status AND the
   `composer.json` or in `tests.yml`.
 
  For example, if you wanted to create a `composer special-tests` command as
-  an alias for `yaml-tests` but with a different file and with a filter, add
+  an alias for `yaml-tasks` but with a different file and with a filter, add
    this to `composer.json`:
 
   ```json
   {
     "scripts": {
       "special-tests": [
-        "which yaml-tests",
-        "yaml-tests myuniquetests --file=custom.yml"
+        "which yaml-tasks",
+        "yaml-tasks myuniquetests --file=custom.yml"
       ]
     }
   }

diff --git a/composer.json b/composer.json
@@ -15,6 +15,9 @@
         "bower-asset/dropzone": "^5.5",
         "cweagans/composer-patches": "^1.6.4",
         "devshop/behat-drupal-extension": "dev-rewrite-last-page-output-links",
+        "devshop/github-api-cli": "^1.6@alpha",
+        "devshop/power-process": "^1.6@alpha",
+        "devshop/yaml-tasks": "^1.6@alpha",
         "drupal-composer/drupal-scaffold": "^2.0.0",
         "drupal/address": "^1.4",
         "drupal/admin_toolbar": "^1.24",
@@ -96,7 +99,7 @@
         "drupal/restui": "^1.16",
         "drupal/role_delegation": "^1.0@alpha",
         "drupal/seckit": "^1.1",
-        "drupal/simplesamlphp_auth": "^3.0",
+        "drupal/simplesamlphp_auth": "3.1.0",
         "drupal/site_alert": "1.x-dev#7e8a229292ec6cf85cb5e22d8a58afac098c3bd1",
         "drupal/slack": "^1.2",
         "drupal/social_media_links": "^2.6",
@@ -107,7 +110,7 @@
         "drupal/toolbar_menu_clean": "^1.0",
         "drupal/tour_ui": "^1.0@beta",
         "drupal/ui_patterns": "^1.0",
-        "drupal/user_history": "^1.0@alpha",
+        "drupal/user_history": "1.0.0-alpha3",
         "drupal/uswds": "^1.0@beta",
         "drupal/video_embed_media": "^2.2",
         "drupal/views_bulk_edit": "^2.3",
@@ -126,15 +129,15 @@
         "mouf/nodejs-installer": "^1.0",
         "npm-asset/yarn": "1.12.3",
         "phpunit/phpunit": "^6",
-        "provision-ops/yaml-tests": "~1.9",
         "querypath/querypath": "^3.0",
-        "simplesamlphp/simplesamlphp": "^1.17",
+        "simplesamlphp/simplesamlphp": "v1.17.8",
         "squizlabs/php_codesniffer": "^3.5",
         "symfony/config": "^3.4",
         "symfony/finder": "^3",
         "symfony/phpunit-bridge": "^4.3",
         "twig/twig": "^1.38.2",
         "va-gov/web": "dev-master",
+        "vlucas/phpdotenv": "~2",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
         "weitzman/drupal-test-traits": "dev-master",
@@ -370,9 +373,9 @@
         "va:web:install": [
             "# Preparing Front-end...",
             "cd bin && ln -sf ../docroot/libraries/yarn/bin/yarn yarn",
-            "node -v",
-            "npm -v",
-            "yarn -v",
+            "which node && node -v",
+            "which npm && npm -v",
+            "which yarn && yarn -v",
             "cd web && yarn run install-repos",
             "export NODE_EXTRA_CA_CERTS=/etc/pki/tls/certs/ca-bundle.crt PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=TRUE; cd web && yarn install"
         ],