Skip to content

Commit 5a65920

Browse files
committed
pipeline(depls): rename secrets resource to avoid useless job triggering
After we updated resource triggering mechanism, we now need to rename the secrets resource used to trigger jobs to avoid a job triggering burst. related to #172
1 parent 87a70ad commit 5a65920

File tree

5 files changed

+55
-21
lines changed

5 files changed

+55
-21
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ bin/
1313
out/
1414
/coverage/
1515

16-
spec/tasks/git_reset_wip/**
16+
spec/tasks/git_reset_wip/reference-resource/
1717
/Readme.md.toc.*
1818
/Readme.md.orig.*
19-

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ resources:
200200
<% end %>
201201

202202
<% if enabled_deployments.any? || disabled_deployments.any? || all_ci_deployments.any? %>
203-
- name: secrets-<%=depls %>
203+
- name: secrets-<%=depls %>-trigger
204204
type: git
205205
source:
206206
uri: ((secrets-uri))
@@ -274,7 +274,7 @@ jobs:
274274
- get: paas-templates-full
275275
params: { submodules: none}
276276
<%= "passed: [update-pipeline-#{depls}-generated]" if all_ci_deployments.any? %>
277-
- get: secrets-<%= depls %>
277+
- get: secrets-<%= depls %>-trigger
278278
version: every
279279
trigger: true
280280
<%= "passed: [update-pipeline-#{depls}-generated]" if all_ci_deployments.any? %>
@@ -298,11 +298,11 @@ jobs:
298298
- get: cf-ops-automation
299299
params: { submodules: none}
300300
passed: [delete-deployments-review]
301-
- get: secrets-<%= depls %>
301+
- get: secrets-<%= depls %>-trigger
302302
params: { submodules: none}
303303
passed: [delete-deployments-review]
304304
- task: delete_deployments
305-
input_mapping: {scripts-resource: cf-ops-automation, secrets: secrets-<%= depls %>}
305+
input_mapping: {scripts-resource: cf-ops-automation, secrets: secrets-<%= depls %>-trigger}
306306
file: cf-ops-automation/concourse/tasks/bosh_delete_apply/task.yml
307307
params:
308308
BOSH_TARGET: ((bosh-target))
@@ -706,7 +706,7 @@ jobs:
706706
- aggregate:
707707
- get: cf-ops-automation
708708
params: { submodules: none}
709-
- get: secrets-<%= depls %>
709+
- get: secrets-<%= depls %>-trigger
710710
params: { submodules: none}
711711
- task: generate-<%= depls %>-pipeline
712712
output_mapping: {result-dir: trigger-<%= depls %>-plan}
@@ -832,7 +832,7 @@ jobs:
832832
params: { submodules: none}
833833
attempts: 2
834834
# trigger: true
835-
- get: secrets-<%= depls %>
835+
- get: secrets-<%= depls %>-trigger
836836
params: { submodules: none}
837837
attempts: 2
838838
- get: paas-templates-<%= depls %>-versions
@@ -913,13 +913,13 @@ jobs:
913913
- get: paas-templates-full
914914
params: { submodules: none}
915915
attempts: 2
916-
- get: secrets-<%= depls %>
916+
- get: secrets-<%= depls %>-trigger
917917
version: every
918918
params: { submodules: none}
919919
attempts: 2
920920
trigger: true
921921
- task: generate-<%= depls %>-pipeline
922-
input_mapping: {scripts-resource: cf-ops-automation,templates: paas-templates-wip,secrets: secrets-<%= depls %>}
922+
input_mapping: {scripts-resource: cf-ops-automation,templates: paas-templates-wip,secrets: secrets-<%= depls %>-trigger}
923923
output_mapping: {result-dir: concourse-<%= depls %>-pipeline}
924924
config:
925925
platform: linux

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ resources:
7777
tag_filter: ((cf-ops-automation-tag-filter))
7878
skip_ssl_verification: true
7979

80-
- name: secrets-delete-depls
80+
- name: secrets-delete-depls-trigger
8181
type: git
8282
source:
8383
uri: ((secrets-uri))
@@ -112,7 +112,7 @@ jobs:
112112
- get: paas-templates-full
113113
params:
114114
submodules: none
115-
- get: secrets-delete-depls
115+
- get: secrets-delete-depls-trigger
116116
version: every
117117
trigger: true
118118
params:
@@ -138,15 +138,15 @@ jobs:
138138
submodules: none
139139
passed:
140140
- delete-deployments-review
141-
- get: secrets-delete-depls
141+
- get: secrets-delete-depls-trigger
142142
params:
143143
submodules: none
144144
passed:
145145
- delete-deployments-review
146146
- task: delete_deployments
147147
input_mapping:
148148
scripts-resource: cf-ops-automation
149-
secrets: secrets-delete-depls
149+
secrets: secrets-delete-depls-trigger
150150
file: cf-ops-automation/concourse/tasks/bosh_delete_apply/task.yml
151151
params:
152152
BOSH_TARGET: ((bosh-target))

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ resources:
154154
branch: ((paas-templates-branch))
155155
skip_ssl_verification: true
156156

157-
- name: secrets-simple-depls
157+
- name: secrets-simple-depls-trigger
158158
type: git
159159
source:
160160
uri: ((secrets-uri))
@@ -501,7 +501,7 @@ jobs:
501501
- aggregate:
502502
- get: cf-ops-automation
503503
params: { submodules: none}
504-
- get: secrets-simple-depls
504+
- get: secrets-simple-depls-trigger
505505
params: { submodules: none}
506506
- task: generate-simple-depls-pipeline
507507
output_mapping: {result-dir: trigger-simple-depls-plan}
@@ -619,7 +619,7 @@ jobs:
619619
params: { submodules: none}
620620
attempts: 2
621621
# trigger: true
622-
- get: secrets-simple-depls
622+
- get: secrets-simple-depls-trigger
623623
params: { submodules: none}
624624
attempts: 2
625625
- get: paas-templates-simple-depls-versions
@@ -685,13 +685,13 @@ jobs:
685685
- get: paas-templates-full
686686
params: { submodules: none}
687687
attempts: 2
688-
- get: secrets-simple-depls
688+
- get: secrets-simple-depls-trigger
689689
version: every
690690
params: { submodules: none}
691691
attempts: 2
692692
trigger: true
693693
- task: generate-simple-depls-pipeline
694-
input_mapping: {scripts-resource: cf-ops-automation,templates: paas-templates-wip,secrets: secrets-simple-depls}
694+
input_mapping: {scripts-resource: cf-ops-automation,templates: paas-templates-wip,secrets: secrets-simple-depls-trigger}
695695
output_mapping: {result-dir: concourse-simple-depls-pipeline}
696696
config:
697697
platform: linux

upgrade/v2.2.0/01-upgrade-config.sh

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,49 @@
88
#set -o xtrace # debug mode
99
set -o errexit # exit on errors
1010

11-
CONFIG_REPO="$1"
12-
echo "Migrating config repo clone at ${CONFIG_REPO}"
11+
function usage() {
12+
echo "Usage: $0 -c <CONFIG_REPOSITORY_PATH> [-a <CF_OPS_AUTOMATION_PATH>] [-t <PAAS_TEMPLATES_PATH>]"
13+
exit 1
14+
}
1315

1416
function need_upgrade() {
1517
echo "checking whether upgrade is needed"
1618
find "${CONFIG_REPO}" -name "ci-deployment-overview.yml" | xargs grep -n mattermost
1719
return $?
1820
}
21+
22+
while getopts ":c:t:a:" o; do
23+
case "${o}" in
24+
a)
25+
CF_OPS_AUTOMATION=$OPTARG
26+
;;
27+
c)
28+
CONFIG_REPO=$OPTARG
29+
;;
30+
t)
31+
PAAS_TEMPLATES=$OPTARG
32+
;;
33+
\?)
34+
echo "Invalid option: -$OPTARG" >&2
35+
exit 1
36+
;;
37+
:)
38+
echo "Argument required by $OPTARG"
39+
exit 1
40+
;;
41+
*)
42+
usage
43+
;;
44+
esac
45+
done
46+
47+
if [ -z "${CONFIG_REPO}" ]; then
48+
usage
49+
fi
50+
51+
52+
echo "Migrating config repo clone at ${CONFIG_REPO}"
53+
1954
if ! need_upgrade ; then
2055
echo "No need to apply upgrade."
2156
exit 0

0 commit comments

Comments
 (0)