pipeline(*): prune 'meta-inf' key with spruce and include meta-inf.ym…

…l in triggering
orange-cloudfoundry · Oct 4, 2019 · ee68358 · ee68358
1 parent da9c061
commit ee68358
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/concourse/pipelines/template/bosh-pipeline.yml.erb b/concourse/pipelines/template/bosh-pipeline.yml.erb
@@ -89,7 +89,7 @@ resources:
   type: git
   source:
     uri: ((paas-templates-uri))
-    paths: ["shared-config.yml", "<%= depls %>/template"<%= terraform_config_path_value || '' %>]
+    paths: ["shared-config.yml", "meta-inf.yml", "<%= depls %>/template"<%= terraform_config_path_value || '' %>]
     branch: pipeline-current-((paas-templates-branch))
     skip_ssl_verification: true
 

diff --git a/concourse/tasks/generate_manifest/spruce-manifest.sh b/concourse/tasks/generate_manifest/spruce-manifest.sh
@@ -4,5 +4,6 @@ set -eu
 
 spruce merge \
   --prune secrets \
+  --prune meta-inf \
   --prune terraform_outputs \
   "$@"
diff --git a/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml b/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml
@@ -48,7 +48,7 @@ resources:
   type: git
   source:
     uri: ((paas-templates-uri))
-    paths: ["shared-config.yml", "another-world-root-depls/template"]
+    paths: ["shared-config.yml", "meta-inf.yml", "another-world-root-depls/template"]
     branch: pipeline-current-((paas-templates-branch))
     skip_ssl_verification: true
 - name: cf-ops-automation

diff --git a/spec/scripts/generate-depls/fixtures/references/delete-depls-bosh-ref.yml b/spec/scripts/generate-depls/fixtures/references/delete-depls-bosh-ref.yml
@@ -47,7 +47,7 @@ resources:
     type: git
     source:
       uri: ((paas-templates-uri))
-      paths: ["shared-config.yml", "delete-depls/template"]
+      paths: ["shared-config.yml", "meta-inf.yml", "delete-depls/template"]
       branch: pipeline-current-((paas-templates-branch))
       skip_ssl_verification: true
   - name: cf-ops-automation

diff --git a/spec/scripts/generate-depls/fixtures/references/empty-depls.yml b/spec/scripts/generate-depls/fixtures/references/empty-depls.yml
@@ -66,7 +66,7 @@ resources:
   type: git
   source:
     uri: ((paas-templates-uri))
-    paths: ["shared-config.yml","dummy-depls/template"]
+    paths: ["shared-config.yml", "meta-inf.yml","dummy-depls/template"]
     branch: ((paas-templates-branch))
     skip_ssl_verification: true
 

diff --git a/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-ref.yml b/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-ref.yml
@@ -47,7 +47,7 @@ resources:
     type: git
     source:
       uri: ((paas-templates-uri))
-      paths: ["shared-config.yml", "simple-depls/template"]
+      paths: ["shared-config.yml", "meta-inf.yml", "simple-depls/template"]
       branch: pipeline-current-((paas-templates-branch))
       skip_ssl_verification: true
   - name: cf-ops-automation