diff --git a/.circleci/build-and-test/workflows.yml b/.circleci/build-and-test/workflows.yml index 99d7c4fff..1081c40e7 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/scripts/deploy-backend.sh b/scripts/deploy-backend.sh index 6347b4070..ea5b607b2 100755 --- a/scripts/deploy-backend.sh +++ b/scripts/deploy-backend.sh @@ -123,7 +123,7 @@ update_plg_networking() { cf target -o hhs-acf-ofa -s "$CF_SPACE" # Promtial needs to send logs to Loki - cf add-network-policy "$CGAPPNAME_BACKEND" loki -s "tanf-prod" --protocol tcp --port 8080 + cf add-network-policy "$CGAPPNAME_BACKEND" loki --protocol tcp --port 8080 # Add network policy allowing Grafana to talk to the backend and to allow the backend to talk to Grafana # TODO: to avoid having to target the prod space, move the network policies from grafana to an app to plg/deploy.sh