Skip to content

Commit 6f2634f

Browse files
committed
pipeline(depls): fix regression after secrets resource renaming
One place forgotten... related to #172
1 parent 5a65920 commit 6f2634f

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

concourse/pipelines/template/depls-pipeline.yml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ jobs:
957957
<% if vars_file.end_with?('-versions.yml') %>
958958
<%= "- paas-templates-wip/#{vars_file}" %>
959959
<% else %>
960-
<%= "- secrets-#{depls}/#{vars_file}" %>
960+
<%= "- secrets-#{depls}-trigger/#{vars_file}" %>
961961
<% end %>
962962
<% end %>
963963
<% end %>

spec/scripts/generate-depls/fixtures/references/simple-depls-init-ref.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,19 @@ jobs:
106106
- put: TO_BE_DEFINED
107107
params:
108108
pipelines:
109-
110109
- name: simple-depls-generated
111110
team: main
112111
config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-generated.yml
113112
vars_files:
114-
- paas-templates-full/simple-depls/simple-depls-versions.yml
113+
- paas-templates-full/simple-depls/simple-depls-versions.yml
114+
- secrets-full/simple-depls/ntp/ntp-credentials.yml
115115
- name: simple-depls-cf-apps-generated
116116
team: custom-team-name
117117
config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-cf-apps-generated.yml
118118
vars_files:
119-
- paas-templates-full/simple-depls/simple-depls-versions.yml
119+
- paas-templates-full/simple-depls/simple-depls-versions.yml
120120
- name: simple-depls-s3-br-upload-generated
121121
team: custom-team-name
122122
config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-s3-br-upload-generated.yml
123123
vars_files:
124-
- paas-templates-full/simple-depls/simple-depls-versions.yml
124+
- paas-templates-full/simple-depls/simple-depls-versions.yml

spec/scripts/generate-depls/fixtures/references/simple-depls-ref.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -720,25 +720,23 @@ jobs:
720720
- put: TO_BE_DEFINED
721721
params:
722722
pipelines:
723-
724723
- name: simple-depls-generated
725724
team: main
726725
config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-generated.yml
727726
vars_files:
728-
- paas-templates-wip/simple-depls/simple-depls-versions.yml
729-
727+
- paas-templates-wip/simple-depls/simple-depls-versions.yml
728+
- secrets-simple-depls-trigger/simple-depls/ntp/ntp-credentials.yml
730729
- name: simple-depls-cf-apps-generated
731730
team: custom-team-name
732731
config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-cf-apps-generated.yml
733732
vars_files:
734-
- paas-templates-wip/simple-depls/simple-depls-versions.yml
733+
- paas-templates-wip/simple-depls/simple-depls-versions.yml
735734
- name: simple-depls-s3-br-upload-generated
736735
team: custom-team-name
737736
config_file: concourse-simple-depls-pipeline/concourse/pipelines/simple-depls-s3-br-upload-generated.yml
738737
vars_files:
739-
- paas-templates-wip/simple-depls/simple-depls-versions.yml
738+
- paas-templates-wip/simple-depls/simple-depls-versions.yml
740739

741-
742740
- task: update-concourse-depls-pipeline
743741
input_mapping: {reference-resource: secrets-full-writer, generated-resource: concourse-simple-depls-pipeline}
744742
output_mapping: {updated-git-resource: updated-secrets}

spec/scripts/generate-depls/fixtures/secrets/simple-depls/ci-deployment-overview.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ci-deployment:
66
simple-depls-generated:
77
vars_files:
88
- simple-depls/simple-depls-versions.yml
9+
- simple-depls/ntp/ntp-credentials.yml
910
simple-depls-cf-apps-generated:
1011
team: custom-team-name
1112
vars_files:
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
#this is an empty credentials file, to test ci-deployment-overview vars_file declaration

0 commit comments

Comments
 (0)