From 04a76348175478bda658c85e24669b2dde1d9e95 Mon Sep 17 00:00:00 2001 From: tt-gsa Date: Mon, 29 Jul 2024 15:38:46 -0400 Subject: [PATCH] VOTE-970: update URIs as preparation for launch --- docs/README.md | 4 ++-- scripts/upkeep | 9 ++++----- testing/pipeline.config.js | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/docs/README.md b/docs/README.md index a7e00261c..3e90189b4 100644 --- a/docs/README.md +++ b/docs/README.md @@ -7,8 +7,8 @@ List of development environments and their equivalent git branches. |---------------------|--------------------|----------------------------|----------------|----------------------------------------------------------| | ssg-dev.vote.gov | cms-dev.vote.gov | vote-drupal-dev | dev | App work that is ready for testing in cloud.gov | | ssg-test.vote.gov | cms-test.vote.gov | vote-drupal-test | test | Pipeline development work ready for testing in cloud.gov | -| ssg-stage.vote.gov | cms-stage.vote.gov | vote-drupal-stage | stage | All work that is ready for release/UAT testing | -| ssg.vote.gov | cms.vote.gov | vote-drupal-prod | prod | All work that is approved and released | +| staging.vote.gov | cms-stage.vote.gov | vote-drupal-stage | stage | All work that is ready for release/UAT testing | +| vote.gov | cms.vote.gov | vote-drupal-prod | prod | All work that is approved and released | ## Table of Contents - [Git standards](standards.md) diff --git a/scripts/upkeep b/scripts/upkeep index 335e6dee6..f0fc52f70 100755 --- a/scripts/upkeep +++ b/scripts/upkeep @@ -21,10 +21,9 @@ export bucket=$(echo $VCAP_SERVICES | jq -r '.s3[] | select(.name | strings | te export bucket_endpoint=$(echo $VCAP_SERVICES | jq -r '.s3[] | select(.name | strings | test("static")).credentials.endpoint') export ssg_endpoint="https://ssg-${environment}.vote.gov" -[ "${environment}" = "prod" ] && export ssg_endpoint="https://beta.vote.gov" - +[ "${environment}" = "stage" ] && export ssg_endpoint="https://staging.vote.gov" +[ "${environment}" = "prod" ] && export ssg_endpoint="https://vote.gov" export ssg_sitemap_endpoint=ssg_endpoint -[ "${environment}" = "prod" ] && export ssg_sitemap_endpoint="https://vote.gov" cd ${app_path} echo "**************************************************" @@ -37,8 +36,8 @@ echo "" echo "**************************************************" echo "Running 'drush tome:static' in '${environment}'..." echo "**************************************************" -drush tome:static --uri=${ssg_endpoint} --path-count=1 --retry-count=0 -y -drush tome:static-export-path '/sitemap.xml,/sitemap_generator/default/sitemap.xsl' --uri=${ssg_sitemap_endpoint} --retry-count=0 -y +drush tome:static --uri=${ssg_endpoint} --path-count=1 --retry-count=3 -y +drush tome:static-export-path '/sitemap.xml,/sitemap_generator/default/sitemap.xsl' --uri=${ssg_sitemap_endpoint} --retry-count=3 -y drush cr echo "'drush tome:static' task...completed!" echo "" diff --git a/testing/pipeline.config.js b/testing/pipeline.config.js index 70b503c75..c4a540cdb 100644 --- a/testing/pipeline.config.js +++ b/testing/pipeline.config.js @@ -3,12 +3,12 @@ const { defineConfig } = require("cypress"); module.exports = defineConfig({ reporter: 'cypress-mochawesome-reporter', e2e: { - baseUrl: 'https://ssg-stage.vote.gov/', + baseUrl: 'https://staging.vote.gov/', redirectionLimit: 100, video: false, viewportHeight: 800, viewportWidth: 1530, - chromeWebSecurity: false, + chromeWebSecurity: false, "retries": { "runMode": 2, }, @@ -31,7 +31,7 @@ reporter: 'cypress-mochawesome-reporter', "username": "editor_test", "role": "content_editor" }, - // info for content mananger role + // info for content mananger role "content_manager": { "username": "manager_test", "role": "content_manager" @@ -45,12 +45,12 @@ reporter: 'cypress-mochawesome-reporter', on('task', { log(message) { console.log(message) - + return null }, table(message) { console.table(message) - + return null } })