Merge branch 'develop' into 3157-new-reparse-meta-through

raft-tech · Oct 16, 2024 · 03bc847 · 03bc847
2 parents a382f74 + 2792776
commit 03bc847
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/.circleci/build-and-test/workflows.yml b/.circleci/build-and-test/workflows.yml
@@ -49,6 +49,12 @@
                 - /^release.*/
           requires:
             - secrets-check
+      - make_erd: # from ../util folder
+          filters:
+            branches:
+              only:
+                - develop
+                - master
 
   build-and-test-backend:
     when: << pipeline.parameters.build_and_test_backend >>

diff --git a/.circleci/util/jobs.yml b/.circleci/util/jobs.yml
@@ -4,6 +4,7 @@
     steps:
       - checkout
       - docker-compose-check
+      - docker-login
       - run:
           name: Run graph_models
           command: |
@@ -13,5 +14,9 @@
             fi
             docker-compose run --rm web bash -c \
             "./manage.py graph_models -a -g -o tdp_erd.png"
+            if [[ ! -f tdp_erd.png ]]; then
+              echo "Entity Relationship Diagram not found."
+              exit 1
+            fi
       - store_artifacts:
           path: tdrs-backend/tdp_erd.png
diff --git a/tdrs-backend/docker-compose.yml b/tdrs-backend/docker-compose.yml
@@ -178,7 +178,7 @@ services:
       - ELASTICSEARCH_LOG_INDEX_SLOW_LEVEL
     volumes:
       - .:/tdpapp
-      - logs:/tdpapp
+      - logs:/tmp
     image: tdp-backend
     build: .
     command: >

diff --git a/tdrs-backend/setup.cfg b/tdrs-backend/setup.cfg
@@ -6,6 +6,7 @@ omit =
     tdpservice/settings/production.py
     tdpservice/settings/staging.py
     tdpservice/wsgi.py
+    tdpservice/scheduling/*
     *test*
     *migrations*
 
@@ -18,6 +19,7 @@ omit =
     tdpservice/settings/production.py
     tdpservice/settings/staging.py
     tdpservice/wsgi.py
+    tdpservice/scheduling/*
     *test*
     *migrations*