Sk/remove historic data load (#4625)

* Remove historic data load * Restore * Remove historic data load * Restore * Changes requested by Alex and Hassan * Update
GSA-TTS · Jan 21, 2025 · 42302c9 · 42302c9
1 parent 9cfe8d6
commit 42302c9
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 133 deletions.
diff --git a/.github/workflows/deploy-application.yml b/.github/workflows/deploy-application.yml
@@ -102,14 +102,6 @@ jobs:
           cf_vars_file: backend/manifests/vars/vars-${{ env.space }}.yml
           command: bin/ops/deploy.sh
 
-      - name: Load historical data
-        uses: cloud-gov/cg-cli-tools@main
-        with:
-          cf_username: ${{ secrets.CF_USERNAME }}
-          cf_password: ${{ secrets.CF_PASSWORD }}
-          cf_org: gsa-tts-oros-fac
-          cf_space: ${{ env.space }}
-          command: cf run-task gsa-fac -k 6G -m 1G --name load_data --command "./load_data.sh"
 
       # This has to happen after an application deployment because the manifest (currently) is responsible
       # for binding the "logdrain service" to the "gsa-fac application". This also needs to be done

diff --git a/.github/workflows/deploy-development.yml b/.github/workflows/deploy-development.yml
@@ -78,11 +78,3 @@ jobs:
     with:
       url: "https://fac-dev.app.cloud.gov/"
 
-  generate-e2e-test-data:
-    needs:
-      - deploy-dev
-    name:
-    uses: ./.github/workflows/end-to-end-test-data-generator.yml
-    secrets: inherit
-    with:
-      environment: "dev"
diff --git a/.github/workflows/end-to-end-test-data-generator.yml b/.github/workflows/end-to-end-test-data-generator.yml
diff --git a/.github/workflows/testing-from-build.yml b/.github/workflows/testing-from-build.yml
@@ -33,10 +33,6 @@ jobs:
         working-directory: ./backend
         run: docker compose -f docker-compose.yml up -d
 
-      - name: Load historical data
-        working-directory: ./backend
-        run: docker compose run web ./load_data.sh
-
       - name: Run Django test suite
         working-directory: ./backend
         run: docker compose -f docker-compose.yml run web bash -c 'coverage run --parallel-mode --concurrency=multiprocessing manage.py test --parallel && coverage combine && coverage report -m --fail-under=85 && coverage xml -o coverage.xml'

diff --git a/.github/workflows/testing-from-ghcr.yml b/.github/workflows/testing-from-ghcr.yml
@@ -34,10 +34,6 @@ jobs:
         working-directory: ./backend
         run: docker compose -f docker-compose-web.yml up -d
 
-      - name: Load historical data
-        working-directory: ./backend
-        run: docker compose -f docker-compose-web.yml run web ./load_data.sh
-
       - name: Run Django test suite
         working-directory: ./backend
         run: |

diff --git a/backend/Makefile b/backend/Makefile
@@ -64,9 +64,6 @@ docker-migrate:
 		python manage.py makemigrations &&\
 		python manage.py migrate'
 
-docker-load-data:
-	docker compose up -d && docker compose run web ./load_data.sh
-
 # Run Django tests with docker
 docker-test:
 	docker compose build

diff --git a/backend/dissemination/README.md b/backend/dissemination/README.md
@@ -142,15 +142,6 @@ Check `backend/support/api/admin_api_v1_1_0/` for more examples.
 
 # End-to-end workbook testing
 
-### How to run the end-to-end test data generator:
-```
-docker compose run web python manage.py end_to_end_test_data_generator --email [email protected] \
-  --year 22 \
-  --dbkey 100010
-```
-- The email address currently must be a User in the system. As this has only been run locally so far, it would often be a test account in my local sandbox env.
-- `year` and `dbkey` are optional. The script will use default values for these if they aren't provided.
-
 ### How to run the workbook generator:
 ```
 docker compose run web python manage.py generate_workbook_files

diff --git a/backend/docker-compose-dual-fac.yml b/backend/docker-compose-dual-fac.yml
@@ -31,17 +31,6 @@ services:
       timeout: 5s
       retries: 10
 
-  #---------------------------------------------
-  # Historic data
-  #---------------------------------------------
-  historic-data:
-    image: ghcr.io/gsa-tts/fac-historic-public-csvs/load-historic-public-data:20230912
-    depends_on:
-      db:
-        condition: service_healthy
-    environment:
-      DATABASE_URL: postgres://postgres@db/postgres
-
   #---------------------------------------------
   # Django app
   #---------------------------------------------

diff --git a/backend/docker-compose-web.yml b/backend/docker-compose-web.yml
@@ -28,14 +28,6 @@ services:
       interval: 10s
       timeout: 5s
       retries: 10
-
-  historic-data:
-    image: ghcr.io/gsa-tts/fac-historic-public-csvs/load-historic-public-data:20230912
-    depends_on:
-      db:
-        condition: service_healthy
-    environment:
-      DATABASE_URL: postgres://postgres@db/postgres
 
   web:
     image: ghcr.io/gsa-tts/fac/web-container:latest

diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml
@@ -31,17 +31,6 @@ services:
       timeout: 5s
       retries: 10
 
-  #---------------------------------------------
-  # Historic data
-  #---------------------------------------------
-  historic-data:
-    image: ghcr.io/gsa-tts/fac-historic-public-csvs/load-historic-public-data:20230912
-    depends_on:
-      db:
-        condition: service_healthy
-    environment:
-      DATABASE_URL: postgres://postgres@db/postgres
-
   #---------------------------------------------
   # Django app
   #---------------------------------------------

diff --git a/backend/load_data.sh b/backend/load_data.sh