Skip to content

Commit d71d885

Browse files
committed
Update CI pipeline
1 parent 86fc392 commit d71d885

File tree

3 files changed

+4
-22
lines changed

3 files changed

+4
-22
lines changed

ci/pipeline.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ anchors:
1111
username: ((docker-hub-username))
1212
password: ((docker-hub-password))
1313
tag: ((milestone))
14-
registry_mirror:
15-
host: ((docker-hub-mirror))
1614
gradle-enterprise-task-params: &gradle-enterprise-task-params
1715
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
1816
GRADLE_ENTERPRISE_CACHE_URL: ((gradle_enterprise_cache_url))
@@ -95,8 +93,6 @@ anchors:
9593
gradle-publish-params: &gradle-publish-params
9694
GRADLE_PUBLISH_KEY: ((gradle-publish-key))
9795
GRADLE_PUBLISH_SECRET: ((gradle-publish-secret))
98-
docker-hub-mirror-vars: &docker-hub-mirror-vars
99-
docker-hub-mirror: ((docker-hub-mirror))
10096
resource_types:
10197
- name: registry-image
10298
type: registry-image
@@ -287,31 +283,27 @@ jobs:
287283
image: ci-image
288284
vars:
289285
ci-image-name: ci-image
290-
<<: *docker-hub-mirror-vars
291286
- task: build-ci-image-jdk11
292287
privileged: true
293288
file: git-repo/ci/tasks/build-ci-image.yml
294289
output_mapping:
295290
image: ci-image-jdk11
296291
vars:
297292
ci-image-name: ci-image-jdk11
298-
<<: *docker-hub-mirror-vars
299293
- task: build-ci-image-jdk17
300294
privileged: true
301295
file: git-repo/ci/tasks/build-ci-image.yml
302296
output_mapping:
303297
image: ci-image-jdk17
304298
vars:
305299
ci-image-name: ci-image-jdk17
306-
<<: *docker-hub-mirror-vars
307300
- task: build-ci-image-jdk19
308301
privileged: true
309302
file: git-repo/ci/tasks/build-ci-image.yml
310303
output_mapping:
311304
image: ci-image-jdk19
312305
vars:
313306
ci-image-name: ci-image-jdk19
314-
<<: *docker-hub-mirror-vars
315307
- in_parallel:
316308
- put: ci-image
317309
params:
@@ -647,8 +639,6 @@ jobs:
647639
RELEASE_TYPE: M
648640
GITHUB_USERNAME: ((github-username))
649641
GITHUB_TOKEN: ((github-ci-release-token))
650-
vars:
651-
<<: *docker-hub-mirror-vars
652642
- put: github-pre-release
653643
params:
654644
name: generated-changelog/tag
@@ -678,8 +668,6 @@ jobs:
678668
RELEASE_TYPE: RC
679669
GITHUB_USERNAME: ((github-username))
680670
GITHUB_TOKEN: ((github-ci-release-token))
681-
vars:
682-
<<: *docker-hub-mirror-vars
683671
- put: github-pre-release
684672
params:
685673
name: generated-changelog/tag
@@ -739,8 +727,6 @@ jobs:
739727
RELEASE_TYPE: RELEASE
740728
GITHUB_USERNAME: ((github-username))
741729
GITHUB_TOKEN: ((github-ci-release-token))
742-
vars:
743-
<<: *docker-hub-mirror-vars
744730
- put: github-release
745731
params:
746732
name: generated-changelog/tag

ci/tasks/build-ci-image.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ image_resource:
55
source:
66
repository: concourse/oci-build-task
77
tag: 0.10.0
8-
registry_mirror:
9-
host: ((docker-hub-mirror))
10-
username: ((docker-hub-mirror-username))
11-
password: ((docker-hub-mirror-password))
8+
username: ((docker-hub-username))
9+
password: ((docker-hub-password))
1210
inputs:
1311
- name: ci-images-git-repo
1412
outputs:

ci/tasks/generate-changelog.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ image_resource:
55
source:
66
repository: springio/github-changelog-generator
77
tag: '0.0.8'
8-
registry_mirror:
9-
host: ((docker-hub-mirror))
10-
username: ((docker-hub-mirror-username))
11-
password: ((docker-hub-mirror-password))
8+
username: ((docker-hub-username))
9+
password: ((docker-hub-password))
1210
inputs:
1311
- name: git-repo
1412
- name: artifactory-repo

0 commit comments

Comments
 (0)