VACMS-5193 Content Build Separation work (#5199)

* Add content-build to composer package

* Change the symlink for web to content build

* Update build script file

* VACMS-5193: Update comment referencing va-gov/web

* Reapply content repoe move

* PHPCS fixes

* VACMS-5005: Update content build to use new jobs

* Change job to correct prefix

* Update tugboat build scripts in content-build repo

* Update static symlink to new content-build repo

* update composer build

* Composer lock update

* Clean up full commands since we will not be building assets anymore.

* Change the branch/PR autocomplete repo

Author: Neil Hastings

.tugboat/config.yml

@@ -157,11 +157,11 @@ services:
         - if [ "$TUGBOAT_PREVIEW_TYPE" = "pullrequest" ]; then bash -lc 'task --taskfile=tests.yml'; fi
 
         # Set file permissions so web based build calls work.  This must run after all web builds are done in tests.
-        - chown -R www-data:www-data "${DOCROOT}/vendor/va-gov/web"
-        - find "${DOCROOT}/vendor/va-gov/web" -type d -exec chmod 2775 {} \+
-        - find "${DOCROOT}/vendor/va-gov/web" -type f -exec chmod 0664 {} \+
-        - find "${DOCROOT}/vendor/va-gov/web/node_modules/.bin" -type f -exec chmod +x {} \+
-        - find "${DOCROOT}/vendor/va-gov/web/script" -type f -exec chmod +x {} \+
+        - chown -R www-data:www-data "${DOCROOT}/vendor/va-gov/content-build"
+        - find "${DOCROOT}/vendor/va-gov/content-build" -type d -exec chmod 2775 {} \+
+        - find "${DOCROOT}/vendor/va-gov/content-build" -type f -exec chmod 0664 {} \+
+        - find "${DOCROOT}/vendor/va-gov/content-build/node_modules/.bin" -type f -exec chmod +x {} \+
+        - find "${DOCROOT}/vendor/va-gov/content-build/script" -type f -exec chmod +x {} \+
 
   memcache:
     image: tugboatqa/memcached:1.6

composer.json

@@ -150,7 +150,7 @@
         "symfony/finder": "^3",
         "symfony/phpunit-bridge": "^5.1",
         "traviscarden/behat-table-comparison": "~0.2",
-        "va-gov/web": "^0.1",
+        "va-gov/content-build": "^0.0.34",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
@@ -502,18 +502,11 @@
             "@va:web:watch"
         ],
         "va:web:build": [
-            "rm -rf docroot/vendor/va-gov/web/build/vagovdev",
-            "cd web && echo \"Downloading assets for vets-website ref $(git rev-parse --verify HEAD)\" ",
-            "cd web && NODE_ENV=production yarn build:content --pull-drupal --no-drupal-proxy --buildtype=vagovdev --api=https://dev-api.va.gov --asset-source=$(git rev-parse --verify HEAD)",
+            "rm -rf docroot/vendor/va-gov/content-build/build/vagovdev",
+            "cd docroot/vendor/va-gov/vets-website && echo \"Downloading assets for vets-website for vagovdev\" ",
+            "cd web && INSTALL_HOOKS=no NODE_ENV=production yarn build --pull-drupal --no-drupal-proxy --buildtype=vagovdev --api=https://dev-api.va.gov",
             "echo 'Replace s3 address with local in generated files'",
-            "find ./docroot/vendor/va-gov/web/build/vagovdev/generated -type f -exec sed -i \"s#https://dev-va-gov-assets\\.s3-us-gov-west-1\\.amazonaws\\.com##g\" {} \\+"
-        ],
-        "va:web:build:full": [
-            "rm -rf docroot/vendor/va-gov/web/build/vagovdev",
-            "cd web && echo \"Building assets for vets-website ref $(git rev-parse --verify HEAD)\" ",
-            "cd web && NODE_ENV=production yarn build --pull-drupal --no-drupal-proxy --buildtype=vagovdev --api=https://dev-api.va.gov --force-content-build",
-            "echo 'Replace s3 address with local in generated files'",
-            "find ./docroot/vendor/va-gov/web/build/vagovdev/generated -type f -exec sed -i \"s#https://dev-va-gov-assets\\.s3-us-gov-west-1\\.amazonaws\\.com##g\" {} \\+"
+            "find ./docroot/vendor/va-gov/content-build/build/vagovdev/generated -type f -exec sed -i \"s#https://dev-va-gov-assets\\.s3-us-gov-west-1\\.amazonaws\\.com##g\" {} \\+"
         ],
         "va:web:test": [
             "echo 'drupal address: ' $DRUPAL_ADDRESS"

composer.lock

@@ -54,7 +54,7 @@ public function __construct(GithubInterface $githubClient, GitInterface $git, Lo
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('va_gov.consumers.github.factory')->get(
-        'department-of-veterans-affairs/vets-website',
+        'department-of-veterans-affairs/content-build',
         'va_cms_bot_github_auth_token'
       ),
       Git::get($container->get('va_gov.build_trigger.web_build_command_builder')->getPathToWebRoot()),

docroot/modules/custom/va_gov_build_trigger/src/Controller/FrontEndBranchAutocompleteController.php

@@ -65,15 +65,15 @@ public function buildCommands(string $front_end_git_ref = NULL, string $unique_k
     $repo_root = $this->getPathToWebRoot();
 
     if (!$front_end_git_ref) {
-      // If no git reference is passed, reset va-gov/web to the default tag. We
-      // do this to ensure that the default tag is used even if a branch or PR
-      // was checked out earlier.
+      // If no git reference is passed, reset va-gov/content-build
+      // to the default tag. We do this to ensure that the default tag is used
+      // even if a branch or PR was checked out earlier.
       $commands += $this->getFrontEndReinstallCommands($repo_root);
     }
     else {
-      // If we are checking out a branch or PR, reset all files in va-gov/web
-      // to their default state. We do this to avoid having the checkout fail
-      // if there are modified files.
+      // If we are checking out a branch or PR, reset all files in
+      // va-gov/content-build to their default state. We do this to avoid
+      // having the checkout fail if there are modified files.
       $commands[] = $this->getFrontEndResetCommand($repo_root);
     }
 
@@ -98,20 +98,11 @@ public function buildComposerCommand(string $composer_command) : string {
   /**
    * The name of the composer command to run.
    *
-   * @param string|null $front_end_git_ref
-   *   Front end git reference to build (branch name or PR number)
-   *
    * @return string
    *   The name of the composer command to run
    */
-  protected function commandName(string $front_end_git_ref = NULL) : string {
-    $command = 'va:web:build';
-
-    if ($front_end_git_ref) {
-      $command .= ':full';
-    }
-
-    return $command;
+  protected function commandName() : string {
+    return 'va:web:build';
   }
 
   /**
@@ -158,13 +149,13 @@ protected function getFrontEndReinstallCommands(string $repo_root) : array {
   }
 
   /**
-   * Build the command to reset va-gov/web files to their default state.
+   * Build a command to reset va-gov/content-build files to their default state.
    *
    * @param string $repo_root
    *   The path to the repository root.
    *
    * @return string
-   *   The command to run to reset va-gov/web files.
+   *   The command to run to reset va-gov/content-build files.
    */
   protected function getFrontEndResetCommand(string $repo_root) : string {
     return "cd {$repo_root} && git reset --hard HEAD";

docroot/modules/custom/va_gov_build_trigger/src/WebBuildCommandBuilder.php

@@ -4,7 +4,7 @@
 
 include dirname(__FILE__) . '/settings.brd_common.php';
 
-$settings['jenkins_build_job_path'] = '/job/builds/job/vets-website-content-vagov' . $settings['jenkins_build_env'];
+$settings['jenkins_build_job_path'] = '/job/builds/job/content-build-content-only-vagov' . $settings['jenkins_build_env'];
 $settings['jenkins_build_job_params'] = '/buildWithParameters?deploy=true';
 $settings['jenkins_build_job_url'] = $settings['jenkins_build_job_host'] . $settings['jenkins_build_job_path'] . $settings['jenkins_build_job_params'];
 

docroot/sites/default/settings/settings.dev.php

@@ -4,7 +4,7 @@
 
 include dirname(__FILE__) . '/settings.brd_common.php';
 
-$settings['jenkins_build_job_path'] = '/job/deploys/job/vets-gov-autodeploy-vets-website';
+$settings['jenkins_build_job_path'] = '/job/deploys/job/vets-gov-autodeploy-content-build';
 $settings['jenkins_build_job_params'] = '/buildWithParameters?' . 'release_wait=0' . '&' . 'use_latest_release=true';
 $settings['jenkins_build_job_url'] = $settings['jenkins_build_job_host'] . $settings['jenkins_build_job_path'] . $settings['jenkins_build_job_params'];
 

docroot/sites/default/settings/settings.prod.php

@@ -4,7 +4,7 @@
 
 include dirname(__FILE__) . '/settings.brd_common.php';
 
-$settings['jenkins_build_job_path'] = '/job/builds/job/vets-website-content-vagov' . $settings['jenkins_build_env'];
+$settings['jenkins_build_job_path'] = '/job/builds/job/content-build-content-only-vagov' . $settings['jenkins_build_env'];
 $settings['jenkins_build_job_params'] = '/buildWithParameters?deploy=true';
 $settings['jenkins_build_job_url'] = $settings['jenkins_build_job_host'] . $settings['jenkins_build_job_path'] . $settings['jenkins_build_job_params'];
 

docroot/sites/default/settings/settings.staging.php

@@ -1 +1 @@
-vendor/va-gov/web/build/vagovdev
+vendor/va-gov/content-build/build/vagovdev

docroot/static

@@ -72,7 +72,7 @@ public function testBuildCommandsGraphQl() {
     );
 
     self::assertEquals(
-      "cd /app/root && COMPOSER_HOME=/composer/home /composer/file/here --no-cache va:web:build:full",
+      "cd /app/root && COMPOSER_HOME=/composer/home /composer/file/here --no-cache va:web:build",
       $commands[3],
       'Web Command Build with commit and GraphQL composer command'
     );
@@ -98,7 +98,7 @@ public function testBuildCommandsGraphQl() {
     );
 
     self::assertEquals(
-      "cd /app/root && COMPOSER_HOME=/composer/home /composer/file/here --no-cache va:web:build:full",
+      "cd /app/root && COMPOSER_HOME=/composer/home /composer/file/here --no-cache va:web:build",
       $commands[3],
       'Web command build with branch and GraphQL composer command'
     );

tests/phpunit/FrontendBuild/WebBuildCommandBuilderTest.php

@@ -1 +1 @@
-docroot/vendor/va-gov/web/
+docroot/vendor/va-gov/content-build