From 8e3da814cf8441b417732b1eb669a6b445ff01f7 Mon Sep 17 00:00:00 2001
From: Eric Lipe <elipe@teamraft.com>
Date: Mon, 18 Nov 2024 08:08:31 -0500
Subject: [PATCH] - disable tests - small updates to deploy script

---
 .circleci/build-and-test/workflows.yml | 112 ++++++++++++-------------
 tdrs-backend/plg/deploy.sh             |   7 +-
 2 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/.circleci/build-and-test/workflows.yml b/.circleci/build-and-test/workflows.yml
index 99d7c4fff..84ea7776d 100644
--- a/.circleci/build-and-test/workflows.yml
+++ b/.circleci/build-and-test/workflows.yml
@@ -3,15 +3,15 @@
     when: << pipeline.parameters.build_and_test_all >>
     jobs:
       - secrets-check
-      - test-backend:
-          requires:
-            - secrets-check
-      - test-frontend:
-          requires:
-            - secrets-check
-      - test-e2e:
-          requires:
-            - secrets-check
+      # - test-backend:
+      #     requires:
+      #       - secrets-check
+      # - test-frontend:
+      #     requires:
+      #       - secrets-check
+      # - test-e2e:
+      #     requires:
+      #       - secrets-check
 
   ci-build-and-test-all:
     jobs:
@@ -22,52 +22,52 @@
                 - main
                 - master
                 - /^release.*/
-      - test-backend:
-          filters:
-            branches:
-              only:
-                - main
-                - master
-                - /^release.*/
-          requires:
-            - secrets-check
-      - test-frontend:
-          filters:
-            branches:
-              only:
-                - main
-                - master
-                - /^release.*/
-          requires:
-            - secrets-check
-      - test-e2e:
-          filters:
-            branches:
-              only:
-                - main
-                - master
-                - /^release.*/
-          requires:
-            - secrets-check
-      - make_erd: # from ../util folder
-          filters:
-            branches:
-              only:
-                - develop
-                - master
+  #     - test-backend:
+  #         filters:
+  #           branches:
+  #             only:
+  #               - main
+  #               - master
+  #               - /^release.*/
+  #         requires:
+  #           - secrets-check
+  #     - test-frontend:
+  #         filters:
+  #           branches:
+  #             only:
+  #               - main
+  #               - master
+  #               - /^release.*/
+  #         requires:
+  #           - secrets-check
+  #     - test-e2e:
+  #         filters:
+  #           branches:
+  #             only:
+  #               - main
+  #               - master
+  #               - /^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 >>
-    jobs:
-      - secrets-check
-      - test-backend:
-          requires:
-            - secrets-check
+  # build-and-test-backend:
+  #   when: << pipeline.parameters.build_and_test_backend >>
+  #   jobs:
+  #     - secrets-check
+  #     - test-backend:
+  #         requires:
+  #           - secrets-check
 
-  build-and-test-frontend:
-    when: << pipeline.parameters.build_and_test_frontend >>
-    jobs:
-      - secrets-check
-      - test-frontend:
-          requires:
-            - secrets-check
+  # build-and-test-frontend:
+  #   when: << pipeline.parameters.build_and_test_frontend >>
+  #   jobs:
+  #     - secrets-check
+  #     - test-frontend:
+  #         requires:
+  #           - secrets-check
diff --git a/tdrs-backend/plg/deploy.sh b/tdrs-backend/plg/deploy.sh
index e2345a6fc..17fa80b65 100755
--- a/tdrs-backend/plg/deploy.sh
+++ b/tdrs-backend/plg/deploy.sh
@@ -151,6 +151,8 @@ err_help_exit() {
     exit
 }
 
+pushd "$(dirname "$0")"
+
 while getopts ":hap:u:d:" option; do
    case $option in
       h) # display Help
@@ -166,9 +168,7 @@ while getopts ":hap:u:d:" option; do
       d) # Bind a Postgres exporter or Grafana to $DB_SERVICE_NAME
          DB_SERVICE_NAME=$OPTARG;;
      \?) # Invalid option
-         echo "Error: Invalid option"
-         help
-         exit;;
+         err_help_exit "Error: Invalid option";;
    esac
 done
 
@@ -177,7 +177,6 @@ if [ "$#" -eq 0 ]; then
     exit
 fi
 
-pushd "$(dirname "$0")"
 if [ "$DB_SERVICE_NAME" == "" ]; then
     err_help_exit "Error: you must include a database service name."
 fi