Skip to content

Commit f9f968c

Browse files
committed
CI: use ghcr image for bosh/integration
Prior to this commit the Docker Hub which is no longer updated. This resulted in the following error: ``` golangci-lint has version 2.1.6 built with go1.24.2 from eabc2638 on 2025-05-04T15:41:19Z lint-ing in '/tmp/build/41714804/bosh-dns-release/src/bosh-dns' ... with GOOS=linux ... Error: can't load config: the Go language version (go1.24) used to build golangci-lint is lower than the targeted Go version (1.25.0) Failed executing command with error: can't load config: the Go language version (go1.24) used to build golangci-lint is lower than the targeted Go version (1.25.0) ```
1 parent 8d75b63 commit f9f968c

File tree

4 files changed

+17
-27
lines changed

4 files changed

+17
-27
lines changed

ci/pipeline.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
trigger: true
1313
- get: golang-release
1414
- get: bosh-dns-release
15+
- get: bosh-integration-image
1516
- task: bump-deps
1617
file: golang-release/ci/tasks/shared/bump-deps.yml
1718
image: golang-release-image
@@ -58,9 +59,10 @@ jobs:
5859
output_mapping:
5960
output_repo: bumped-bosh-dns-release
6061
- task: test-unit
62+
file: bosh-dns-release/ci/tasks/test-unit.yml
63+
image: bosh-integration-image
6164
input_mapping:
6265
bosh-dns-release: bumped-bosh-dns-release
63-
file: bosh-dns-release/ci/tasks/test-unit.yml
6466
- put: bosh-dns-release
6567
params:
6668
repository: bumped-bosh-dns-release
@@ -77,6 +79,7 @@ jobs:
7779
- get: bosh-stemcell
7880
resource: warden-jammy-stemcell
7981
- get: bosh-candidate-release
82+
- get: bosh-integration-image
8083
- task: bump-golang-package
8184
file: golang-release/ci/tasks/shared/bump-golang-package.yml
8285
input_mapping:
@@ -114,6 +117,7 @@ jobs:
114117
json_key: '((cloud-foundry-gcp-credentials))'
115118
- task: create
116119
file: bosh-dns-release/ci/tasks/create-candidate.yml
120+
image: bosh-integration-image
117121
output_mapping:
118122
candidate-release: bumped-release
119123
- task: test-acceptance
@@ -133,8 +137,10 @@ jobs:
133137
plan:
134138
- get: bosh-dns-release
135139
trigger: true
140+
- get: bosh-integration-image
136141
- task: test-unit
137142
file: bosh-dns-release/ci/tasks/test-unit.yml
143+
image: bosh-integration-image
138144

139145
- name: test-unit-windows
140146
public: true
@@ -154,8 +160,10 @@ jobs:
154160
plan:
155161
- get: bosh-dns-release
156162
trigger: true
163+
- get: bosh-integration-image
157164
- task: test-unit-release
158165
file: bosh-dns-release/ci/tasks/test-unit-release.yml
166+
image: bosh-integration-image
159167

160168
- name: pre-integration-fan-in
161169
plan:
@@ -221,7 +229,7 @@ jobs:
221229
- get: bosh-stemcell-windows
222230
resource: aws-windows-2019-stemcell
223231
- get: bosh-candidate-release
224-
- get: docker-bosh-integration-image
232+
- get: bosh-integration-image
225233
- task: create-candidate
226234
file: bosh-dns-release/ci/tasks/create-candidate.yml
227235
- do:
@@ -246,14 +254,14 @@ jobs:
246254
- in_parallel:
247255
- task: windows
248256
file: bosh-dns-release/ci/tasks/windows/test-acceptance-windows.yml
249-
image: docker-bosh-integration-image
257+
image: bosh-integration-image
250258
params:
251259
WINDOWS_OS_VERSION: windows2019
252260
ENV_NAME: windows2019
253261
timeout: 1h
254262
- task: windows-nameserver-disabled
255263
file: bosh-dns-release/ci/tasks/windows/test-acceptance-windows-nameserver-disabled.yml
256-
image: docker-bosh-integration-image
264+
image: bosh-integration-image
257265
params:
258266
WINDOWS_OS_VERSION: windows2019
259267
ENV_NAME: windows2019
@@ -673,12 +681,12 @@ resources:
673681
username: ((docker.username))
674682
password: ((docker.password))
675683

676-
- name: docker-bosh-integration-image
677-
type: registry-image
684+
- name: bosh-integration-image
685+
type: docker-image
678686
source:
679-
repository: bosh/integration
680-
username: ((docker.username))
681-
password: ((docker.password))
687+
repository: ghcr.io/cloudfoundry/bosh/integration
688+
username: ((github_read_write_packages.username))
689+
password: ((github_read_write_packages.password))
682690

683691
- name: bosh-security-scanner-image
684692
type: registry-image

ci/tasks/create-candidate.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: registry-image
6-
source:
7-
repository: bosh/integration
8-
tag: main
9-
104
inputs:
115
- name: bosh-dns-release
126

ci/tasks/test-unit-release.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: registry-image
6-
source:
7-
repository: bosh/integration
8-
tag: main
9-
104
inputs:
115
- name: bosh-dns-release
126

ci/tasks/test-unit.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: registry-image
6-
source:
7-
repository: bosh/integration
8-
tag: "main"
9-
104
inputs:
115
- name: bosh-dns-release
126

0 commit comments

Comments
 (0)