diff --git a/.github/actions/post-deploy-smoke-test/action.yml b/.github/actions/post-deploy-smoke-test/action.yml index 7e3761233c3..0b573ecaa21 100644 --- a/.github/actions/post-deploy-smoke-test/action.yml +++ b/.github/actions/post-deploy-smoke-test/action.yml @@ -12,11 +12,11 @@ runs: working-directory: frontend run: | touch .env - echo REACT_APP_BASE_URL=https://${{ env.DEPLOY_ENV }}.simplereport.gov/ >> .env.production.local + echo REACT_APP_BASE_URL=https://${{ inputs.deploy-env }}.simplereport.gov/ >> .env.production.local - name: Run smoke test script shell: bash working-directory: frontend - run: yarn smoke:prod:deploy:ci + run: yarn smoke:env:deploy:ci # slack_alert: # runs-on: ubuntu-latest diff --git a/frontend/prod-smoke.js b/frontend/deploy-smoke.js similarity index 100% rename from frontend/prod-smoke.js rename to frontend/deploy-smoke.js diff --git a/frontend/package.json b/frontend/package.json index 690d715f00e..dbc0501846d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -76,8 +76,8 @@ "build-storybook": "yarn create-storybook-public && REACT_APP_BACKEND_URL=http://localhost:8080 SASS_PATH=$(cd ./node_modules && pwd):$(cd ./node_modules/@uswds && pwd):$(cd ./node_modules/@uswds/uswds/packages && pwd):$(cd ./src/scss && pwd) storybook build -s storybook_public", "maintenance:start": "[ -z \"$MAINTENANCE_MESSAGE\" ] && echo \"MAINTENANCE_MESSAGE must be set!\" || (echo $MAINTENANCE_MESSAGE > maintenance.json && yarn maintenance:deploy && rm maintenance.json)", "maintenance:deploy": "[ -z \"$MAINTENANCE_ENV\" ] && echo \"MAINTENANCE_ENV must be set!\" || az storage blob upload -f maintenance.json -n maintenance.json -c '$web' --account-name simplereport${MAINTENANCE_ENV}app --overwrite", - "smoke:prod:deploy": "node prod-smoke.js", - "smoke:prod:deploy:ci": "node -r dotenv/config prod-smoke.js dotenv_config_path=.env.production.local dotenv_config_debug=true" + "smoke:env:deploy": "node deploy-smoke.js", + "smoke:env:deploy:ci": "node -r dotenv/config deploy-smoke.js dotenv_config_path=.env.production.local dotenv_config_debug=true" }, "prettier": { "singleQuote": false diff --git a/package.json b/package.json index 8d3fa6562b7..09132f754c1 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "anon:remove": "./backend/db-setup/remove-anon.sh", "test:frontend": "docker compose run --rm -e REACT_APP_BASE_URL=https://simplereport.gov -e REACT_APP_BACKEND_URL=https://simplereport.gov/api -e REACT_APP_OKTA_ENABLED=false frontend yarn test", "test:backend": "docker compose --env-file .env.test -p simple-report-tests up -d db; docker compose --env-file .env.test -p simple-report-tests run --rm backend gradle test -PskipDbSetup=true -PtestDbHost=db; docker compose -p simple-report-tests down -v", - "smoke": "node frontend/prod-smoke.js" + "smoke": "node frontend/deploy-smoke.js" }, "dependencies": {} }