From 39e89edb5e863757a398ea4acecfd1228846ee9f Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Mon, 6 Jul 2020 16:31:04 -0500
Subject: [PATCH] Remove recursive yaml includes

---
 .gitlab-ci.yml           | 1 +
 helpers/build_image.yaml | 7 +++----
 helpers/helm_base.yaml   | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc643cd..0237fbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ include:
   - local: "/helpers/docker_base.yaml"
   - local: "/helpers/helm_base.yaml"
 
+
 build ci:
   stage: .pre
   extends: .docker_based_job
diff --git a/helpers/build_image.yaml b/helpers/build_image.yaml
index f6d3e95..2541dbf 100644
--- a/helpers/build_image.yaml
+++ b/helpers/build_image.yaml
@@ -3,16 +3,15 @@
 #
 # include:
 #   - project: 'cspp_geo/geosphere/geosphere-deploy'
-#     file: '/helpers/build_image.yml'
+#     file: '/helpers/docker_base.yaml'
+#   - project: 'cspp_geo/geosphere/geosphere-deploy'
+#     file: '/helpers/build_image.yaml'
 #
 # build_image_grb:
 #   extends: .build_image
 #   variables:
 #     IMAGE_NAME: "cspp-geo-grb"
 #     IMAGE_DIR: "cspp_geo_grb"
-include:
-  - local: "/helpers/docker_base.yaml"
-
 .build_image:
   extends: .docker_based_job
   variables:
diff --git a/helpers/helm_base.yaml b/helpers/helm_base.yaml
index 49fa7d9..4756581 100644
--- a/helpers/helm_base.yaml
+++ b/helpers/helm_base.yaml
@@ -1,6 +1,3 @@
-include:
-  local: "/helpers/docker_base.yaml"
-
 .helm_based_job:
   extends: .docker_based_job
   image: $CICHART_IMAGE
-- 
GitLab