From ee683585d4f20f12e432c5bd2de6f8241a3b57d9 Mon Sep 17 00:00:00 2001
From: Olivier ORAND <olivier.orand@orange.com>
Date: Fri, 4 Oct 2019 18:25:52 +0200
Subject: [PATCH] pipeline(*): prune 'meta-inf' key with spruce and include
 meta-inf.yml in triggering

---
 concourse/pipelines/template/bosh-pipeline.yml.erb              | 2 +-
 concourse/tasks/generate_manifest/spruce-manifest.sh            | 1 +
 .../pipelines/another-world-root-depls-bosh-generated.yml       | 2 +-
 .../fixtures/references/delete-depls-bosh-ref.yml               | 2 +-
 spec/scripts/generate-depls/fixtures/references/empty-depls.yml | 2 +-
 .../fixtures/references/simple-depls-bosh-ref.yml               | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/concourse/pipelines/template/bosh-pipeline.yml.erb b/concourse/pipelines/template/bosh-pipeline.yml.erb
index 1f120642e..77c34a8da 100755
--- 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
index d8218cbf0..69e414288 100755
--- 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
index 17e713b6d..4913911ad 100644
--- 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
index 3727b1982..6a5e098ee 100644
--- 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
index 95d8405b3..a1527b42e 100644
--- 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
index 2da2f34ba..5a0f26843 100644
--- 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