From 6256949c3ec65b42cb8c92eff94ec802fa22b519 Mon Sep 17 00:00:00 2001
From: andrew-jameson <ajameson@teamraft.com>
Date: Thu, 19 Dec 2024 10:57:13 -0500
Subject: [PATCH] Stacking terraform after deploy jobs

---
 .circleci/deployment/jobs.yml      | 15 +++++----------
 .circleci/deployment/workflows.yml |  8 --------
 .gitignore                         |  2 ++
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.circleci/deployment/jobs.yml b/.circleci/deployment/jobs.yml
index ce163101f..2854859cd 100644
--- a/.circleci/deployment/jobs.yml
+++ b/.circleci/deployment/jobs.yml
@@ -32,13 +32,15 @@
     parameters:
       target_env:
         type: string
-    executor: docker-executor
+    executor: terraform/default
     working_directory: ~/tdp-deploy
     steps:
       - init-deploy
       - deploy-cloud-dot-gov:
           backend-appname: tdp-backend-<< parameters.target_env >>
           frontend-appname: tdp-frontend-<< parameters.target_env >>
+      - deploy-infrastructure:
+          cf-app: << parameters.target_env >> 
 
   deploy-staging:
     executor: docker-executor
@@ -64,15 +66,8 @@
           cf-space: tanf-staging
           cf-username: CF_USERNAME_STAGING
 
-  deploy-infrastructure-dev:
-    parameters:
-      target_env:
-        type: string
-    executor: terraform/default
-    working_directory: ~/tdp-deploy
-    steps:
-      - deploy-infrastructure:
-                cf-app: << parameters.target_env >>
+
+
 
   deploy-infrastructure-staging:
     executor: terraform/default
diff --git a/.circleci/deployment/workflows.yml b/.circleci/deployment/workflows.yml
index 6d90e0d00..527420bf9 100644
--- a/.circleci/deployment/workflows.yml
+++ b/.circleci/deployment/workflows.yml
@@ -11,14 +11,6 @@
 
     jobs:
 # Dev environments
-      - deploy-infrastructure-dev:
-          target_env: << pipeline.parameters.target_env >>
-          filters:
-            branches:
-              ignore:
-                - develop
-                - main
-                - master
       - deploy-dev:
           target_env: << pipeline.parameters.target_env >>
           filters:
diff --git a/.gitignore b/.gitignore
index b627bccc4..5899fe43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ npm-debug.log
 /output/
 /cache/
 boilerplate.zip
+.circleci/generated_config.yml
 
 # Spritesmith
 spritesmith-generated/
@@ -117,3 +118,4 @@ cypress.env.json
 # DB seeds
 tdrs-backend/*.pg
 tdrs-backend/django.log
+