Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VACMS-16853: next build branches ftw #17154

Merged
merged 40 commits into from
Feb 15, 2024
Merged

Conversation

alexfinnarn
Copy link
Contributor

@alexfinnarn alexfinnarn commented Feb 6, 2024

Description

closes #16853

Testing done

  • Updated some tests for git information/API/frontend.
  • Manually tested locally by running script.
  • Need to test on Tugboat with this PR.

Screenshots

Content release form when you can trigger a build.
Screenshot 2024-02-08 at 1 43 57 PM

Content release form when build is running with a link to the build log.
Screenshot 2024-02-08 at 1 46 02 PM

QA steps

  1. Log in and go to "/admin/content/deploy/next"
    • Confirm you can select versions of next-build and vets-website from git references
    • Confirm there is no build in progress
    • No request or lock files should exist
    • The versions for next-build and vets-website should be "__default"
  2. Submit the form with two branches chosen for next-build and vets-website
    • Confirm that a build request file exists.
    • No build should have started yet so no lock file should exist.
    • The versions for next-build and vets-website should be reported as what you selected.
  3. Refresh the page a few times until the background process kicks off from reading the build request file.
    • Confirm that the form fields are locked during the build.
    • Confirm you can view the build log file and it is adding data until the build finishes.
  4. Refresh the form page after the build is complete
    • Confirm the disabled fields are no longer disabled.
    • View the log to see that the build finished. It might have an error, but that will be addressed in future tickets.

Definition of Done

  • Documentation has been updated, if applicable.
  • Tests have been added if necessary.
  • Automated tests have passed.
  • Code Quality Tests have passed.
  • Acceptance Criteria in related issue are met.
  • Manual Code Review Approved.
  • If there are field changes, front end output has been thoroughly checked.

Select Team for PR review

  • CMS Team
  • Public websites
  • Facilities
  • User support
  • Accelerated Publishing

@va-cms-bot va-cms-bot temporarily deployed to Tugboat February 6, 2024 18:09 Destroyed
@github-actions github-actions bot changed the title Vacms 16853 next build branches ftw VACMS-16853: next build branches ftw Feb 6, 2024
@github-actions github-actions bot added Accelerated Publishing CMS Team CMS Product team that manages both editor exp and devops labels Feb 6, 2024
@va-cms-bot va-cms-bot temporarily deployed to Tugboat February 6, 2024 21:21 Destroyed
@va-cms-bot va-cms-bot temporarily deployed to Tugboat February 6, 2024 21:55 Destroyed
@va-cms-bot va-cms-bot temporarily deployed to Tugboat February 9, 2024 15:31 Destroyed
@va-cms-bot va-cms-bot temporarily deployed to Tugboat February 9, 2024 15:51 Destroyed
@alexfinnarn alexfinnarn marked this pull request as ready for review February 9, 2024 15:59
@alexfinnarn alexfinnarn requested review from a team as code owners February 9, 2024 15:59
docroot/sites/default/settings/settings.local.php Outdated Show resolved Hide resolved
scripts/next-install.sh Show resolved Hide resolved
@@ -126,6 +126,7 @@
$settings['va_gov_web_root'] = '/var/www/cms/web';
$settings['va_gov_app_root'] = '/var/www/cms';
$settings['va_gov_vets_website_root'] = '/var/www/cms/docroot/vendor/va-gov/vets-website';
$settings['va_gov_next_build_root'] = '../next';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason this is relative vs the rest of the roots above? /var/www/cms/next ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No reason, just I knew that next was one directory above the docroot. I thought the right location for next was /var/www/html/next in ddev, but I could have gotten the wrong place if the repo is included other places. I don't see /var/www/cms locally, just /var/www/html/web which is a symlink to docroot/vendor/va-gov/content-build. But since this is a default settings file, I'm not sure these values carry through other overrides. They do get overriden in other settings files.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if they get overridden elsewhere i'm not too worried about it. /var/www/cms/ may even be leftover from when the project used lando before ddev. it just stuck out to me because it was noticeably different format than the lines above.

scripts/next-build-frontend.sh Outdated Show resolved Hide resolved
scripts/next-build-frontend.sh Outdated Show resolved Hide resolved
scripts/next-build-frontend.sh Outdated Show resolved Hide resolved
@va-cms-bot va-cms-bot temporarily deployed to Tugboat February 9, 2024 18:47 Destroyed
@va-cms-bot va-cms-bot temporarily deployed to Tugboat February 9, 2024 18:48 Destroyed
@va-cms-bot va-cms-bot temporarily deployed to Tugboat February 9, 2024 19:16 Destroyed
@va-cms-bot va-cms-bot temporarily deployed to Tugboat February 15, 2024 19:25 Destroyed
Copy link
Contributor

@edmund-dunn edmund-dunn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, nice and clean!!

@tjheffner tjheffner merged commit 828acc9 into main Feb 15, 2024
18 checks passed
@tjheffner tjheffner deleted the VACMS-16853-next-build-branches-ftw branch February 15, 2024 20:26
tjheffner added a commit that referenced this pull request Feb 16, 2024
edmund-dunn pushed a commit that referenced this pull request Feb 16, 2024
alexfinnarn added a commit that referenced this pull request Feb 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Accelerated Publishing CMS Team CMS Product team that manages both editor exp and devops
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Next Build and Vets Website branches can be chosen on Tugboat
4 participants