pipeline(depls): fix regression after secrets resource renaming

One place forgotten... related to #172
orange-cloudfoundry · Jul 24, 2018 · 6f2634f · 6f2634f
1 parent 5a65920
commit 6f2634f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/concourse/pipelines/template/depls-pipeline.yml.erb b/concourse/pipelines/template/depls-pipeline.yml.erb
@@ -957,7 +957,7 @@ jobs:
       <% if vars_file.end_with?('-versions.yml') %>
         <%= "- paas-templates-wip/#{vars_file}" %>
       <% else %>
-        <%= "- secrets-#{depls}/#{vars_file}" %>
+        <%= "- secrets-#{depls}-trigger/#{vars_file}" %>
       <% end %>
     <% end %>
   <% end %>

diff --git a/spec/scripts/generate-depls/fixtures/references/simple-depls-init-ref.yml b/spec/scripts/generate-depls/fixtures/references/simple-depls-init-ref.yml
@@ -106,19 +106,19 @@ jobs:
   - put: TO_BE_DEFINED
     params:
       pipelines:
-
       - name: simple-depls-generated
         team: main
         config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-generated.yml
         vars_files:
-         - paas-templates-full/simple-depls/simple-depls-versions.yml
+          - paas-templates-full/simple-depls/simple-depls-versions.yml
+          - secrets-full/simple-depls/ntp/ntp-credentials.yml
       - name: simple-depls-cf-apps-generated
         team: custom-team-name
         config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-cf-apps-generated.yml
         vars_files:
-         - paas-templates-full/simple-depls/simple-depls-versions.yml
+          - paas-templates-full/simple-depls/simple-depls-versions.yml
       - name: simple-depls-s3-br-upload-generated
         team: custom-team-name
         config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-s3-br-upload-generated.yml
         vars_files:
-        - paas-templates-full/simple-depls/simple-depls-versions.yml
+          - paas-templates-full/simple-depls/simple-depls-versions.yml
diff --git a/spec/scripts/generate-depls/fixtures/references/simple-depls-ref.yml b/spec/scripts/generate-depls/fixtures/references/simple-depls-ref.yml
@@ -720,25 +720,23 @@ jobs:
   - put: TO_BE_DEFINED
     params:
       pipelines:
-
       - name: simple-depls-generated
         team: main
         config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-generated.yml
         vars_files:
-         - paas-templates-wip/simple-depls/simple-depls-versions.yml
-
+          - paas-templates-wip/simple-depls/simple-depls-versions.yml
+          - secrets-simple-depls-trigger/simple-depls/ntp/ntp-credentials.yml
       - name: simple-depls-cf-apps-generated
         team: custom-team-name
         config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-cf-apps-generated.yml
         vars_files:
-         - paas-templates-wip/simple-depls/simple-depls-versions.yml
+          - paas-templates-wip/simple-depls/simple-depls-versions.yml
       - name: simple-depls-s3-br-upload-generated
         team: custom-team-name
         config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-s3-br-upload-generated.yml
         vars_files:
-        - paas-templates-wip/simple-depls/simple-depls-versions.yml
+          - paas-templates-wip/simple-depls/simple-depls-versions.yml
 
-
   - task: update-concourse-depls-pipeline
     input_mapping: {reference-resource: secrets-full-writer, generated-resource: concourse-simple-depls-pipeline}
     output_mapping: {updated-git-resource: updated-secrets}

diff --git a/spec/scripts/generate-depls/fixtures/secrets/simple-depls/ci-deployment-overview.yml b/spec/scripts/generate-depls/fixtures/secrets/simple-depls/ci-deployment-overview.yml
@@ -6,6 +6,7 @@ ci-deployment:
       simple-depls-generated:
         vars_files:
         - simple-depls/simple-depls-versions.yml
+        - simple-depls/ntp/ntp-credentials.yml
       simple-depls-cf-apps-generated:
         team: custom-team-name
         vars_files:

diff --git a/spec/scripts/generate-depls/fixtures/secrets/simple-depls/ntp/ntp-credentials.yml b/spec/scripts/generate-depls/fixtures/secrets/simple-depls/ntp/ntp-credentials.yml
@@ -0,0 +1,2 @@
+---
+#this is an empty credentials file, to test ci-deployment-overview vars_file declaration
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		---
		#this is an empty credentials file, to test ci-deployment-overview vars_file declaration