Skip to content

Commit 81ced3e

Browse files
committed
Improve parameterization of the CI pipeline
Closes gh-38394
1 parent 19f8e04 commit 81ced3e

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

ci/parameters.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
github-repo: "https://github.com/spring-projects/spring-boot.git"
2-
github-repo-name: "spring-projects/spring-boot"
1+
github-organization-name: "spring-projects"
2+
github-repository-name: "spring-boot"
3+
github-repository-uri: "https://github.com/spring-projects/spring-boot.git"
34
homebrew-tap-repo: "https://github.com/spring-io/homebrew-tap.git"
45
docker-hub-organization: "springci"
6+
docker-hub-repository-prefix: "spring-boot"
57
artifactory-url: "https://repo.spring.io"
68
branch: "2.7.x"
79
milestone: "2.7.x"

ci/pipeline.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
anchors:
22
git-repo-resource-source: &git-repo-resource-source
3-
uri: ((github-repo))
3+
uri: ((github-repository-uri))
44
username: ((github-username))
55
password: ((github-ci-release-token))
66
branch: ((branch))
@@ -22,8 +22,8 @@ anchors:
2222
DOCKER_HUB_PASSWORD: ((docker-hub-password))
2323
DOCKER_HUB_AUTH: ((docker-hub-auth))
2424
github-task-params: &github-task-params
25-
GITHUB_REPO: spring-boot
26-
GITHUB_ORGANIZATION: spring-projects
25+
GITHUB_REPO: ((github-repository-name))
26+
GITHUB_ORGANIZATION: ((github-organization-name))
2727
GITHUB_PASSWORD: ((github-ci-release-token))
2828
GITHUB_USERNAME: ((github-username))
2929
MILESTONE: ((milestone))
@@ -143,50 +143,50 @@ resources:
143143
type: github-release
144144
icon: briefcase-download-outline
145145
source:
146-
owner: spring-projects
147-
repository: spring-boot
146+
owner: ((github-organization-name))
147+
repository: ((github-repository-name))
148148
access_token: ((github-ci-release-token))
149149
pre_release: true
150150
release: false
151151
- name: github-release
152152
type: github-release
153153
icon: briefcase-download
154154
source:
155-
owner: spring-projects
156-
repository: spring-boot
155+
owner: ((github-organization-name))
156+
repository: ((github-repository-name))
157157
access_token: ((github-ci-release-token))
158158
pre_release: false
159159
- name: ci-images-git-repo
160160
type: git
161161
icon: github
162162
source:
163-
uri: ((github-repo))
163+
uri: ((github-repository-uri))
164164
branch: ((branch))
165165
paths: ["ci/images/*"]
166166
- name: ci-image
167167
type: registry-image
168168
icon: docker
169169
source:
170170
<<: *ci-registry-image-resource-source
171-
repository: ((docker-hub-organization))/spring-boot-ci
171+
repository: ((docker-hub-organization))/((docker-hub-repository-prefix))-ci
172172
- name: ci-image-jdk11
173173
type: registry-image
174174
icon: docker
175175
source:
176176
<<: *ci-registry-image-resource-source
177-
repository: ((docker-hub-organization))/spring-boot-ci-jdk11
177+
repository: ((docker-hub-organization))/((docker-hub-repository-prefix))-ci-jdk11
178178
- name: ci-image-jdk17
179179
type: registry-image
180180
icon: docker
181181
source:
182182
<<: *ci-registry-image-resource-source
183-
repository: ((docker-hub-organization))/spring-boot-ci-jdk17
183+
repository: ((docker-hub-organization))/((docker-hub-repository-prefix))-ci-jdk17
184184
- name: ci-image-jdk21
185185
type: registry-image
186186
icon: docker
187187
source:
188188
<<: *ci-registry-image-resource-source
189-
repository: ((docker-hub-organization))/spring-boot-ci-jdk21
189+
repository: ((docker-hub-organization))/((docker-hub-repository-prefix))-ci-jdk21
190190
- name: paketo-builder-base-image
191191
type: registry-image
192192
icon: docker
@@ -207,31 +207,31 @@ resources:
207207
type: github-status-resource
208208
icon: eye-check-outline
209209
source:
210-
repository: ((github-repo-name))
210+
repository: ((github-organization-name))/((github-repository-name))
211211
access_token: ((github-ci-status-token))
212212
branch: ((branch))
213213
context: build
214214
- name: repo-status-jdk11-build
215215
type: github-status-resource
216216
icon: eye-check-outline
217217
source:
218-
repository: ((github-repo-name))
218+
repository: ((github-organization-name))/((github-repository-name))
219219
access_token: ((github-ci-status-token))
220220
branch: ((branch))
221221
context: jdk11-build
222222
- name: repo-status-jdk17-build
223223
type: github-status-resource
224224
icon: eye-check-outline
225225
source:
226-
repository: ((github-repo-name))
226+
repository: ((github-organization-name))/((github-repository-name))
227227
access_token: ((github-ci-status-token))
228228
branch: ((branch))
229229
context: jdk17-build
230230
- name: repo-status-jdk21-build
231231
type: github-status-resource
232232
icon: eye-check-outline
233233
source:
234-
repository: ((github-repo-name))
234+
repository: ((github-organization-name))/((github-repository-name))
235235
access_token: ((github-ci-status-token))
236236
branch: ((branch))
237237
context: jdk21-build

0 commit comments

Comments
 (0)