From 04eedc935b75502154d36606afc284b55b2d8477 Mon Sep 17 00:00:00 2001 From: George Hudson Date: Mon, 31 Jul 2023 10:29:59 -0600 Subject: [PATCH] keeping make_erd job and commands definitions in separate folder --- .circleci/deployment/commands.yml | 53 ------------------------------ .circleci/deployment/jobs.yml | 19 ----------- .circleci/deployment/workflows.yml | 4 +-- .circleci/generate_config.sh | 2 ++ .circleci/util/commands.yml | 53 ++++++++++++++++++++++++++++++ .circleci/util/jobs.yml | 18 ++++++++++ 6 files changed, 75 insertions(+), 74 deletions(-) create mode 100644 .circleci/util/commands.yml create mode 100644 .circleci/util/jobs.yml diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml index 2c565e4834..54bd7d1084 100644 --- a/.circleci/deployment/commands.yml +++ b/.circleci/deployment/commands.yml @@ -150,59 +150,6 @@ echo "export DEPLOY_STRATEGY=rolling" >> $BASH_ENV fi - docker-compose-check: - steps: - - run: - name: Ensure docker-compose exists, otherwise install it. - command: ./scripts/docker-compose-check.sh - - docker-compose-up-backend: - steps: - - run: - name: Build and spin-up Django API service - command: cd tdrs-backend; docker network create external-net; docker-compose up -d --build - - cf-check: - steps: - - run: - name: Ensure cf cli is installed, otherwise install it. - command: sudo ./scripts/cf-check.sh - - # This allows us to use the orb stanza for node/install within other commands - # NOTE: This doesn't work correctly on machine executors - install-nodejs: node/install - - sudo-check: - steps: - - run: - name: Ensure sudo is installed, otherwise install it. - command: ./scripts/sudo-check.sh - - login-cloud-dot-gov: - description: Authenticates with Cloud.gov and sets org and space targets - parameters: - cf-password: - type: env_var_name - default: CF_PASSWORD_DEV - cf-org: - type: env_var_name - default: CF_ORG - cf-space: - type: string - default: tanf-dev - cf-username: - type: env_var_name - default: CF_USERNAME_DEV - steps: - - run: - name: Login to Cloud.gov and set application targets - command: | - cf login -a https://api.fr.cloud.gov \ - -u ${<>} \ - -p ${<>} \ - -o ${<>} \ - -s <> - deploy-infrastructure: parameters: tf-path: diff --git a/.circleci/deployment/jobs.yml b/.circleci/deployment/jobs.yml index 7f381e972c..542f331361 100644 --- a/.circleci/deployment/jobs.yml +++ b/.circleci/deployment/jobs.yml @@ -123,25 +123,6 @@ cf-username: <> cf-space: <> - - make_erd: - executor: machine-executor - working_directory: ~/tdp_apps - steps: - - checkout - - docker-compose-check - - run: - name: Run graph_models - command: | - cd tdrs-backend - if [ $(docker network inspect external-net 2>&1 | grep -c Scope) == 0 ]; then - docker network create external-net - fi - docker-compose run --rm web bash -c \ - "./manage.py graph_models -a -g -o tdp_erd.png" - - store_artifacts: - path: tdrs-backend/tdp_erd.png - test-deployment-e2e: executor: machine-executor working_directory: ~/tdp-apps diff --git a/.circleci/deployment/workflows.yml b/.circleci/deployment/workflows.yml index 76bc521d8c..6ecaae41fe 100644 --- a/.circleci/deployment/workflows.yml +++ b/.circleci/deployment/workflows.yml @@ -60,7 +60,7 @@ branches: only: - develop - - make_erd: + - make_erd: # from ../util folder filters: branches: only: @@ -118,7 +118,7 @@ branches: only: - master - - make_erd: + - make_erd: # from ../util folder filters: branches: only: diff --git a/.circleci/generate_config.sh b/.circleci/generate_config.sh index f2e93f84cc..0349eb3520 100644 --- a/.circleci/generate_config.sh +++ b/.circleci/generate_config.sh @@ -7,12 +7,14 @@ echo 'commands:' >> generated_config.yml cat build-and-test/commands.yml >> generated_config.yml cat deployment/commands.yml >> generated_config.yml cat owasp/commands.yml >> generated_config.yml +cat util/commands.yml >> generated_config.yml # Jobs echo 'jobs:' >> generated_config.yml cat build-and-test/jobs.yml >> generated_config.yml cat deployment/jobs.yml >> generated_config.yml cat owasp/jobs.yml >> generated_config.yml +cat util/jobs.yml >> generated_config.yml # Workflows echo 'workflows:' >> generated_config.yml diff --git a/.circleci/util/commands.yml b/.circleci/util/commands.yml new file mode 100644 index 0000000000..ebbdfb7e10 --- /dev/null +++ b/.circleci/util/commands.yml @@ -0,0 +1,53 @@ +# commands: + docker-compose-check: + steps: + - run: + name: Ensure docker-compose exists, otherwise install it. + command: ./scripts/docker-compose-check.sh + + docker-compose-up-backend: + steps: + - run: + name: Build and spin-up Django API service + command: cd tdrs-backend; docker network create external-net; docker-compose up -d --build + + cf-check: + steps: + - run: + name: Ensure cf cli is installed, otherwise install it. + command: sudo ./scripts/cf-check.sh + + # This allows us to use the orb stanza for node/install within other commands + # NOTE: This doesn't work correctly on machine executors + install-nodejs: node/install + + sudo-check: + steps: + - run: + name: Ensure sudo is installed, otherwise install it. + command: ./scripts/sudo-check.sh + + login-cloud-dot-gov: + description: Authenticates with Cloud.gov and sets org and space targets + parameters: + cf-password: + type: env_var_name + default: CF_PASSWORD_DEV + cf-org: + type: env_var_name + default: CF_ORG + cf-space: + type: string + default: tanf-dev + cf-username: + type: env_var_name + default: CF_USERNAME_DEV + steps: + - run: + name: Login to Cloud.gov and set application targets + command: | + cf login -a https://api.fr.cloud.gov \ + -u ${<>} \ + -p ${<>} \ + -o ${<>} \ + -s <> diff --git a/.circleci/util/jobs.yml b/.circleci/util/jobs.yml new file mode 100644 index 0000000000..9ba582f8ed --- /dev/null +++ b/.circleci/util/jobs.yml @@ -0,0 +1,18 @@ +# jobs: + make_erd: + executor: machine-executor + working_directory: ~/tdp_apps + steps: + - checkout + - docker-compose-check + - run: + name: Run graph_models + command: | + cd tdrs-backend + if [ $(docker network inspect external-net 2>&1 | grep -c Scope) == 0 ]; then + docker network create external-net + fi + docker-compose run --rm web bash -c \ + "./manage.py graph_models -a -g -o tdp_erd.png" + - store_artifacts: + path: tdrs-backend/tdp_erd.png