diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index b56db5408..614484a2a 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -9,12 +9,7 @@ on: jobs: variables: if: | - startsWith(github.head_ref, 'ik/') - || startsWith(github.head_ref, 'jon') - || startsWith(github.head_ref, 'sspj/') - || startsWith(github.head_ref, 'mr/') - || startsWith(github.head_ref, 'nmb/') - || startsWith(github.head_ref, 'ab/') + startsWith(github.head_ref, 'ab/') || startsWith(github.head_ref, 'bl/') || startsWith(github.head_ref, 'rjm/') || startsWith(github.head_ref, 'rb/') diff --git a/.github/workflows/migrate.yaml b/.github/workflows/migrate.yaml index 67ffb4717..574ec9fa0 100644 --- a/.github/workflows/migrate.yaml +++ b/.github/workflows/migrate.yaml @@ -20,11 +20,6 @@ on: - ab - bl - rjm - - jon - - ik - - sspj - - nmb - - mr jobs: migrate: diff --git a/.github/workflows/reset-db.yaml b/.github/workflows/reset-db.yaml index 111314f12..4b9a9eafb 100644 --- a/.github/workflows/reset-db.yaml +++ b/.github/workflows/reset-db.yaml @@ -21,11 +21,6 @@ on: - ab - bl - rjm - - jon - - ik - - sspj - - nmb - - mr jobs: reset-db: diff --git a/ops/manifests/manifest-ik.yaml b/ops/manifests/manifest-ik.yaml deleted file mode 100644 index 60571e9ba..000000000 --- a/ops/manifests/manifest-ik.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -applications: -- name: getgov-ik - buildpacks: - - python_buildpack - path: ../../src - instances: 1 - memory: 512M - stack: cflinuxfs4 - timeout: 180 - command: ./run.sh - health-check-type: http - health-check-http-endpoint: /health - env: - # Send stdout and stderr straight to the terminal without buffering - PYTHONUNBUFFERED: yup - # Tell Django where to find its configuration - DJANGO_SETTINGS_MODULE: registrar.config.settings - # Tell Django where it is being hosted - DJANGO_BASE_URL: https://getgov-ik.app.cloud.gov - # Tell Django how much stuff to log - DJANGO_LOG_LEVEL: INFO - # Public site base URL - GETGOV_PUBLIC_SITE_URL: https://federalist-877ab29f-16f6-4f12-961c-96cf064cf070.sites.pages.cloud.gov/site/cisagov/getgov-home/ - routes: - - route: getgov-ik.app.cloud.gov - services: - - getgov-credentials - - getgov-ik-database diff --git a/ops/manifests/manifest-jon.yaml b/ops/manifests/manifest-jon.yaml deleted file mode 100644 index acc226ce3..000000000 --- a/ops/manifests/manifest-jon.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -applications: -- name: getgov-jon - buildpacks: - - python_buildpack - path: ../../src - instances: 1 - memory: 512M - stack: cflinuxfs4 - timeout: 180 - command: ./run.sh - health-check-type: http - health-check-http-endpoint: /health - env: - # Send stdout and stderr straight to the terminal without buffering - PYTHONUNBUFFERED: yup - # Tell Django where to find its configuration - DJANGO_SETTINGS_MODULE: registrar.config.settings - # Tell Django where it is being hosted - DJANGO_BASE_URL: https://getgov-jon.app.cloud.gov - # Tell Django how much stuff to log - DJANGO_LOG_LEVEL: INFO - # Public site base URL - GETGOV_PUBLIC_SITE_URL: https://federalist-877ab29f-16f6-4f12-961c-96cf064cf070.sites.pages.cloud.gov/site/cisagov/getgov-home/ - routes: - - route: getgov-jon.app.cloud.gov - services: - - getgov-credentials - - getgov-jon-database diff --git a/ops/manifests/manifest-mr.yaml b/ops/manifests/manifest-mr.yaml deleted file mode 100644 index 2ad39b9ff..000000000 --- a/ops/manifests/manifest-mr.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -applications: -- name: getgov-mr - buildpacks: - - python_buildpack - path: ../../src - instances: 1 - memory: 512M - stack: cflinuxfs4 - timeout: 180 - command: ./run.sh - health-check-type: http - health-check-http-endpoint: /health - env: - # Send stdout and stderr straight to the terminal without buffering - PYTHONUNBUFFERED: yup - # Tell Django where to find its configuration - DJANGO_SETTINGS_MODULE: registrar.config.settings - # Tell Django where it is being hosted - DJANGO_BASE_URL: https://getgov-mr.app.cloud.gov - # Tell Django how much stuff to log - DJANGO_LOG_LEVEL: INFO - # Public site base URL - GETGOV_PUBLIC_SITE_URL: https://federalist-877ab29f-16f6-4f12-961c-96cf064cf070.sites.pages.cloud.gov/site/cisagov/getgov-home/ - routes: - - route: getgov-mr.app.cloud.gov - services: - - getgov-credentials - - getgov-mr-database diff --git a/ops/manifests/manifest-nmb.yaml b/ops/manifests/manifest-nmb.yaml deleted file mode 100644 index adea312d5..000000000 --- a/ops/manifests/manifest-nmb.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -applications: -- name: getgov-nmb - buildpacks: - - python_buildpack - path: ../../src - instances: 1 - memory: 512M - stack: cflinuxfs4 - timeout: 180 - command: ./run.sh - health-check-type: http - health-check-http-endpoint: /health - env: - # Send stdout and stderr straight to the terminal without buffering - PYTHONUNBUFFERED: yup - # Tell Django where to find its configuration - DJANGO_SETTINGS_MODULE: registrar.config.settings - # Tell Django where it is being hosted - DJANGO_BASE_URL: https://getgov-nmb.app.cloud.gov - # Tell Django how much stuff to log - DJANGO_LOG_LEVEL: INFO - # Public site base URL - GETGOV_PUBLIC_SITE_URL: https://federalist-877ab29f-16f6-4f12-961c-96cf064cf070.sites.pages.cloud.gov/site/cisagov/getgov-home/ - routes: - - route: getgov-nmb.app.cloud.gov - services: - - getgov-credentials - - getgov-nmb-database diff --git a/ops/manifests/manifest-sspj.yaml b/ops/manifests/manifest-sspj.yaml deleted file mode 100644 index cec82c8a1..000000000 --- a/ops/manifests/manifest-sspj.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -applications: -- name: getgov-sspj - buildpacks: - - python_buildpack - path: ../../src - instances: 1 - memory: 512M - stack: cflinuxfs4 - timeout: 180 - command: ./run.sh - health-check-type: http - health-check-http-endpoint: /health - env: - # Send stdout and stderr straight to the terminal without buffering - PYTHONUNBUFFERED: yup - # Tell Django where to find its configuration - DJANGO_SETTINGS_MODULE: registrar.config.settings - # Tell Django where it is being hosted - DJANGO_BASE_URL: https://getgov-sspj.app.cloud.gov - # Tell Django how much stuff to log - DJANGO_LOG_LEVEL: INFO - # Public site base URL - GETGOV_PUBLIC_SITE_URL: https://federalist-877ab29f-16f6-4f12-961c-96cf064cf070.sites.pages.cloud.gov/site/cisagov/getgov-home/ - routes: - - route: getgov-sspj.app.cloud.gov - services: - - getgov-credentials - - getgov-sspj-database diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py index 29f1689a1..15f8b45a9 100644 --- a/src/registrar/config/settings.py +++ b/src/registrar/config/settings.py @@ -570,11 +570,6 @@ ALLOWED_HOSTS = [ "getgov-ab.app.cloud.gov", "getgov-bl.app.cloud.gov", "getgov-rjm.app.cloud.gov", - "getgov-jon.app.cloud.gov", - "getgov-mr.app.cloud.gov", - "getgov-sspj.app.cloud.gov", - "getgov-nmb.app.cloud.gov", - "getgov-ik.app.cloud.gov", "get.gov", ] diff --git a/src/registrar/fixtures.py b/src/registrar/fixtures.py index 02a6915aa..1e5f5145e 100644 --- a/src/registrar/fixtures.py +++ b/src/registrar/fixtures.py @@ -24,31 +24,6 @@ class UserFixture: """ ADMINS = [ - { - "username": "c4a0e101-73b4-4d7d-9e5e-7f19a726a0fa", - "first_name": "Seamus", - "last_name": "Johnston", - }, - { - "username": "d4c3bd84-dc3a-48bc-a3c3-f53111df2ec6", - "first_name": "Igor", - "last_name": "", - }, - { - "username": "ee80bfe0-49ad-456d-8d82-e2b608a66517", - "first_name": "Logan", - "last_name": "", - }, - { - "username": "2ffe71b0-cea4-4097-8fb6-7a35b901dd70", - "first_name": "Neil", - "last_name": "Martinsen-Burrell", - }, - { - "username": "7185e6cd-d3c8-4adc-90a3-ceddba71d24f", - "first_name": "Jon", - "last_name": "Roberts", - }, { "username": "5f283494-31bd-49b5-b024-a7e7cae00848", "first_name": "Rachid", @@ -59,11 +34,6 @@ class UserFixture: "first_name": "Alysia", "last_name": "Broddrick", }, - { - "username": "55a3bc26-cd1d-4a5c-a8c0-7e1f561ef7f4", - "first_name": "Michelle", - "last_name": "Rago", - }, { "username": "8f8e7293-17f7-4716-889b-1990241cbd39", "first_name": "Katherine",