Skip to content

Commit 12b5fa8

Browse files
committed
CI: pipeline passes image to tasks
- use ghcr.io images
1 parent cde9407 commit 12b5fa8

17 files changed

+78
-161
lines changed

ci/docker/write-metadata-file.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
---
22
platform: linux
33

4-
image_resource:
5-
type: docker-image
6-
source:
7-
repository: ubuntu
8-
tag: jammy
9-
104
inputs:
115
- name: bosh-cli-docker-src
126

ci/pipeline.yml

Lines changed: 77 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
---
22
jobs:
3-
- name: build-bosh-cli-docker-image
3+
- name: build-bosh-cli-ci-image
44
public: true
55
serial: true
66
plan:
77
- in_parallel:
8+
- get: ubuntu-image
89
- get: bosh-cli-docker-src
910
trigger: true
1011
- get: golang-release-image
1112
trigger: true
1213
- task: write-metadata-file
1314
file: bosh-cli-docker-src/ci/docker/write-metadata-file.yml
14-
- put: bosh-cli-docker-image
15+
image: ubuntu-image
16+
- put: bosh-cli-ci-docker-image
1517
params:
1618
build: docker-files
1719
tag: docker-files/tag
@@ -21,72 +23,86 @@ jobs:
2123
- name: bump-deps
2224
public: true
2325
plan:
24-
- get: weekly
25-
trigger: true
26-
- get: bosh-cli
27-
- get: golang-release
26+
- in_parallel:
27+
- get: bosh-cli
28+
- get: bosh-cli-ci-image
29+
- get: golang-release
30+
- get: weekly
31+
trigger: true
2832
- task: bump-deps
2933
file: golang-release/ci/tasks/shared/bump-deps.yml
3034
input_mapping:
3135
input_repo: bosh-cli
3236
output_mapping:
3337
output_repo: bumped-bosh-cli
3438
- task: test-unit
39+
file: bosh-cli/ci/tasks/test-unit.yml
40+
image: bosh-cli-ci-image
3541
input_mapping:
3642
bosh-cli: bumped-bosh-cli
37-
file: bosh-cli/ci/tasks/test-unit.yml
3843
- put: bosh-cli
3944
params:
4045
repository: bumped-bosh-cli
4146

4247
- name: test-unit
4348
public: true
4449
plan:
45-
- get: bosh-cli
46-
trigger: true
50+
- in_parallel:
51+
- get: bosh-cli-ci-image
52+
- get: bosh-cli
53+
trigger: true
4754
- in_parallel:
4855
- task: lint
4956
file: bosh-cli/ci/tasks/lint.yml
57+
image: bosh-cli-ci-image
5058
- task: test-build-docs-example
5159
file: bosh-cli/ci/tasks/test-build-docs-example.yml
60+
image: bosh-cli-ci-image
5261
- task: test-build
5362
file: bosh-cli/ci/tasks/test-build.yml
63+
image: bosh-cli-ci-image
5464
- task: test-unit
5565
file: bosh-cli/ci/tasks/test-unit.yml
66+
image: bosh-cli-ci-image
5667

5768
- name: test-integration
5869
public: true
5970
plan:
60-
- get: bosh-cli
61-
trigger: true
71+
- in_parallel:
72+
- get: warden-cpi-image
73+
- get: bosh-cli
74+
trigger: true
6275
- task: test-integration
6376
file: bosh-cli/ci/tasks/test-integration.yml
77+
image: warden-cpi-image
6478
privileged: true
6579

6680
- name: test-acceptance
6781
public: true
6882
plan:
6983
- in_parallel:
84+
- get: warden-cpi-image
7085
- get: bosh-cli
71-
passed: [ test-unit,test-integration ]
86+
passed:
87+
- test-unit
88+
- test-integration
7289
trigger: true
7390
- get: bosh-warden-cpi-release
7491
trigger: true
7592
- get: stemcell
7693
resource: bosh-warden-stemcell-jammy
77-
- get: warden-cpi-image
78-
- in_parallel:
79-
- task: test-acceptance
80-
file: bosh-cli/ci/tasks/test-acceptance.yml
81-
image: warden-cpi-image
82-
privileged: true
94+
- task: test-acceptance
95+
file: bosh-cli/ci/tasks/test-acceptance.yml
96+
image: warden-cpi-image
97+
privileged: true
8398

8499
- name: integration-postgres
85100
public: true
86101
serial: true
87102
build_logs_to_retain: 250
88103
plan:
89104
- in_parallel:
105+
- get: bosh-cli-ci-image
90106
- get: bosh-ci
91107
resource: bosh-src
92108
trigger: true
@@ -103,13 +119,14 @@ jobs:
103119
- get: integration-postgres-15-image
104120
- task: build-linux-amd64
105121
file: bosh-cli/ci/tasks/build-linux-amd64.yml
122+
image: bosh-cli-ci-image
106123
- task: tests
124+
file: bosh-ci/ci/tasks/test-rake-task.yml
125+
image: integration-postgres-15-image
107126
privileged: true
108127
input_mapping:
109128
bosh: bosh-ci
110129
bosh-cli: compiled-linux-amd64
111-
file: bosh-ci/ci/tasks/test-rake-task.yml
112-
image: integration-postgres-15-image
113130
params:
114131
DB: postgresql
115132
RAKE_TASK: "spec:integration"
@@ -159,6 +176,7 @@ jobs:
159176
serial: true
160177
plan:
161178
- in_parallel:
179+
- get: bosh-cli-ci-image
162180
- get: bosh-cli
163181
params:
164182
fetch_tags: true
@@ -173,6 +191,7 @@ jobs:
173191
- get: release-bucket-linux
174192
- task: build-linux-amd64
175193
file: bosh-cli/ci/tasks/build-linux-amd64.yml
194+
image: bosh-cli-ci-image
176195
- try:
177196
task: check-for-updated-binary-version
178197
file: golang-release/ci/tasks/shared/check-for-updated-binary-version.yml
@@ -198,12 +217,9 @@ jobs:
198217
task-output-folder: patched_cves
199218
- try:
200219
task: check-needs-release
220+
image: bosh-cli-ci-image
201221
config:
202222
platform: linux
203-
image_resource:
204-
type: docker-image
205-
source:
206-
repository: alpine
207223
inputs:
208224
- name: release-notes
209225
run:
@@ -232,6 +248,7 @@ jobs:
232248
public: true
233249
plan:
234250
- in_parallel:
251+
- get: bosh-cli-ci-image
235252
- get: bosh-cli
236253
passed:
237254
- pre-release-fan-in
@@ -242,18 +259,25 @@ jobs:
242259
- in_parallel:
243260
- task: build-linux-amd64
244261
file: bosh-cli/ci/tasks/build-linux-amd64.yml
262+
image: bosh-cli-ci-image
245263
- task: build-linux-arm64
246264
file: bosh-cli/ci/tasks/build-linux-arm64.yml
265+
image: bosh-cli-ci-image
247266
- task: build-darwin-amd64
248267
file: bosh-cli/ci/tasks/build-darwin-amd64.yml
268+
image: bosh-cli-ci-image
249269
- task: build-darwin-arm64
250270
file: bosh-cli/ci/tasks/build-darwin-arm64.yml
271+
image: bosh-cli-ci-image
251272
- task: build-windows-amd64
252273
file: bosh-cli/ci/tasks/build-windows-amd64.yml
274+
image: bosh-cli-ci-image
253275
- task: build-checksum-file
254276
file: bosh-cli/ci/tasks/build-checksum-file.yml
277+
image: bosh-cli-ci-image
255278
- task: create-dockerfile
256279
file: bosh-cli/ci/tasks/create-dockerfile.yml
280+
image: bosh-cli-ci-image
257281
- put: bosh-cli
258282
params:
259283
repository: bosh-cli
@@ -283,12 +307,9 @@ jobs:
283307
tag_as_latest: true
284308
- do:
285309
- task: prepare-version
310+
image: bosh-cli-ci-image
286311
config:
287312
platform: linux
288-
image_resource:
289-
type: docker-image
290-
source:
291-
repository: alpine
292313
run:
293314
path: /bin/sh
294315
args:
@@ -313,6 +334,7 @@ jobs:
313334
body: checksums/checksums
314335
- task: update-homebrew-formula
315336
file: bosh-cli/ci/tasks/update-homebrew-formula.yml
337+
image: bosh-cli-ci-image
316338
- put: homebrew-tap
317339
params:
318340
repository: update-brew-formula-output/homebrew-tap
@@ -334,6 +356,7 @@ jobs:
334356
public: true
335357
plan:
336358
- in_parallel:
359+
- get: bosh-cli-ci-image
337360
- get: bosh-cli
338361
passed:
339362
- pre-release-fan-in
@@ -346,33 +369,38 @@ jobs:
346369
file: alpha-version-semver/number
347370
- in_parallel:
348371
- task: build-linux-amd64
372+
file: bosh-cli/ci/tasks/build-linux-amd64.yml
373+
image: bosh-cli-ci-image
349374
input_mapping:
350375
version-semver: alpha-version-semver
351-
file: bosh-cli/ci/tasks/build-linux-amd64.yml
352376
params:
353377
FILENAME_PREFIX: "alpha-"
354378
- task: build-linux-arm64
379+
file: bosh-cli/ci/tasks/build-linux-arm64.yml
380+
image: bosh-cli-ci-image
355381
input_mapping:
356382
version-semver: alpha-version-semver
357-
file: bosh-cli/ci/tasks/build-linux-arm64.yml
358383
params:
359384
FILENAME_PREFIX: "alpha-"
360385
- task: build-darwin-amd64
386+
file: bosh-cli/ci/tasks/build-darwin-amd64.yml
387+
image: bosh-cli-ci-image
361388
input_mapping:
362389
version-semver: alpha-version-semver
363-
file: bosh-cli/ci/tasks/build-darwin-amd64.yml
364390
params:
365391
FILENAME_PREFIX: "alpha-"
366392
- task: build-darwin-arm64
393+
file: bosh-cli/ci/tasks/build-darwin-arm64.yml
394+
image: bosh-cli-ci-image
367395
input_mapping:
368396
version-semver: alpha-version-semver
369-
file: bosh-cli/ci/tasks/build-darwin-arm64.yml
370397
params:
371398
FILENAME_PREFIX: "alpha-"
372399
- task: build-windows-amd64
400+
file: bosh-cli/ci/tasks/build-windows-amd64.yml
401+
image: bosh-cli-ci-image
373402
input_mapping:
374403
version-semver: alpha-version-semver
375-
file: bosh-cli/ci/tasks/build-windows-amd64.yml
376404
params:
377405
FILENAME_PREFIX: "alpha-"
378406
- in_parallel:
@@ -396,12 +424,14 @@ jobs:
396424
public: true
397425
plan:
398426
- in_parallel:
427+
- get: bosh-cli-ci-image
399428
- get: alpha-release-bucket-linux-amd64
400429
passed: [ build-alpha ]
401430
- get: bosh-cli
402431
passed: [ build-alpha ]
403432
- task: test-helper-urls
404433
file: bosh-cli/ci/tasks/test-helper-urls.yml
434+
image: bosh-cli-ci-image
405435

406436
resources:
407437
- name: bosh-src
@@ -476,17 +506,17 @@ resources:
476506
- name: warden-cpi-image
477507
type: registry-image
478508
source:
479-
repository: bosh/warden-cpi
480-
username: ((bosh-dockerhub.username))
481-
password: ((bosh-dockerhub.password))
509+
repository: ghcr.io/cloudfoundry/bosh/warden-cpi
510+
username: ((github_read_write_packages.username))
511+
password: ((github_read_write_packages.password))
482512

483513
- name: integration-postgres-15-image
484514
type: registry-image
485515
source:
486-
repository: bosh/main-postgres-15
516+
repository: ghcr.io/cloudfoundry/bosh/main-postgres-15
487517
tag: main
488-
username: ((dockerhub_username))
489-
password: ((dockerhub_password))
518+
username: ((github_read_write_packages.username))
519+
password: ((github_read_write_packages.password))
490520

491521
- name: release-bucket-linux
492522
type: gcs-resource
@@ -597,7 +627,14 @@ resources:
597627
password: ((github_read_write_packages.password))
598628
email: foo@bar.com
599629

600-
- name: bosh-cli-docker-image
630+
- name: bosh-cli-ci-image
631+
type: registry-image
632+
source:
633+
repository: ghcr.io/cloudfoundry/bosh/cli
634+
username: ((github_read_write_packages.username))
635+
password: ((github_read_write_packages.password))
636+
637+
- name: bosh-cli-ci-docker-image
601638
type: docker-image
602639
source:
603640
repository: ghcr.io/cloudfoundry/bosh/cli

ci/tasks/build-checksum-file.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
---
22
platform: linux
33

4-
image_resource:
5-
type: docker-image
6-
source:
7-
repository: ghcr.io/cloudfoundry/bosh/cli
8-
tag: 'latest'
9-
username: ((github_read_write_packages.username))
10-
password: ((github_read_write_packages.password))
11-
124
inputs:
135
- name: bosh-cli
146
- name: compiled-linux-amd64

ci/tasks/build-darwin-amd64.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
---
22
platform: linux
33

4-
image_resource:
5-
type: docker-image
6-
source:
7-
repository: ghcr.io/cloudfoundry/bosh/cli
8-
tag: 'latest'
9-
username: ((github_read_write_packages.username))
10-
password: ((github_read_write_packages.password))
11-
124
inputs:
135
- name: bosh-cli
146
- name: version-semver

ci/tasks/build-darwin-arm64.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
---
22
platform: linux
33

4-
image_resource:
5-
type: docker-image
6-
source:
7-
repository: ghcr.io/cloudfoundry/bosh/cli
8-
tag: 'latest'
9-
username: ((github_read_write_packages.username))
10-
password: ((github_read_write_packages.password))
11-
124
inputs:
135
- name: bosh-cli
146
- name: version-semver

0 commit comments

Comments
 (0)