Skip to content

Commit 7d91bba

Browse files
committed
Simplify groups:
Rename light stemcell `build-` => `create-`
1 parent 06ddc31 commit 7d91bba

1 file changed

Lines changed: 19 additions & 27 deletions

File tree

ci/pipeline-template.yml

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -160,46 +160,36 @@ params:
160160
groups:
161161
- name: build
162162
jobs:
163-
- build-stemcell
164-
- test-unit
165-
- build-os-image
166-
#@ for iaas in data.values.stemcell_details.include_iaas:
167-
- build-(@= iaas.iaas @)-(@= iaas.hypervisor @)
168-
#@ end
169-
#@ for iaas in data.values.stemcell_details.include_fips_iaas:
170-
- build-(@= iaas.iaas @)-(@= iaas.hypervisor @)-fips
171-
#@ end
172163
- bats
173-
- test-stemcells-ipv4
174-
- test-stemcells-ipv6
164+
- build-*
165+
- test-unit
166+
- test-stemcells-*
175167
- aggregate-candidate-stemcells
176168
- name: publish
177169
jobs:
178-
- build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
179-
- build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
180-
- publish-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
170+
- create-light-*
171+
- publish-*
181172

182173
- name: auto-bumps
183174
jobs:
184175
- bump-deps
185176
- bump-golang-deps
186177
- bump-bosh-agent
187-
#@ for blobstore_type in data.values.blobstore_types:
188-
- bump-bosh-blobstore-(@= blobstore_type @)
189-
#@ end
178+
- bump-bosh-blobstore-*
190179

191180
- name: automatic-triggers
192181
jobs:
193182
- process-high-critical-cves
194183
- check-usn-packages-are-available
195184
- log-low-medium-cves
196185
- notify-of-usn
186+
197187
- name: infrastructure-tending
198188
jobs:
199189
- build-os-image-stemcell-builder
200190
- ensure-integration-network
201-
- cleanup-published-aws-light-stemcells-older-than-three-years
202-
- cleanup-unpublished-(@= data.values.stemcell_details.os_name @)-aws-light-stemcells
191+
- cleanup-published-*
192+
- cleanup-unpublished-*
203193

204194
#@yaml/text-templated-strings
205195
jobs:
@@ -1015,7 +1005,8 @@ jobs:
10151005
- #@ cleanup_unpublished_light_stemcells("us-gov")
10161006
#!- #@ cleanup_unpublished_light_stemcells("cn")
10171007

1018-
- name: build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1008+
- name: create-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1009+
old_name: build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
10191010
plan:
10201011
- get: bosh-stemcells-ci
10211012
- get: aws-light-stemcell-builder-registry-image
@@ -1104,7 +1095,8 @@ jobs:
11041095
version: us-input-stemcell/.resource/version
11051096
serial: true
11061097

1107-
- name: build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1098+
- name: create-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1099+
old_name: build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
11081100
plan:
11091101
- in_parallel:
11101102
- get: stemcell
@@ -1205,23 +1197,23 @@ jobs:
12051197
params:
12061198
skip_download: true
12071199
passed:
1208-
- build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1209-
- build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1200+
- create-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1201+
- create-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
12101202
resource: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
12111203
- get: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
12121204
passed:
1213-
- build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1214-
- build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1205+
- create-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1206+
- create-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
12151207
#@ if len(data.values.stemcell_details.include_fips_iaas) > 0:
12161208
- get: candidate-(@= data.values.stemcell_details.os_name @)-fips-stemcell-(@= str(data.values.stemcell_details.major_version) @)
12171209
#@ end
12181210
- get: candidate-google-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
12191211
passed:
1220-
- build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1212+
- create-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
12211213
- get: candidate-aws-light-stemcell
12221214
resource: candidate-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
12231215
passed:
1224-
- build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
1216+
- create-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
12251217
- file: bosh-stemcells-ci/ci/tasks/build-release-metadata.yml
12261218
image: os-image-stemcell-builder-registry-image
12271219
task: build-release-metadata

0 commit comments

Comments
 (0)