Drop CI registry mirror settings

pull/28747/head
Phillip Webb 3 years ago
parent b6d0b44703
commit e9beac6fd6

@ -11,6 +11,3 @@ milestone: "2.6.x"
build-name: "spring-boot" build-name: "spring-boot"
concourse-url: "https://ci.spring.io" concourse-url: "https://ci.spring.io"
task-timeout: 2h00m task-timeout: 2h00m
registry-mirror-host: docker.repo.spring.io
registry-mirror-username: ((artifactory-username))
registry-mirror-password: ((artifactory-password))

@ -88,10 +88,6 @@ anchors:
gradle-publish-params: &gradle-publish-params gradle-publish-params: &gradle-publish-params
GRADLE_PUBLISH_KEY: ((gradle-publish-key)) GRADLE_PUBLISH_KEY: ((gradle-publish-key))
GRADLE_PUBLISH_SECRET: ((gradle-publish-secret)) GRADLE_PUBLISH_SECRET: ((gradle-publish-secret))
registry-mirror-vars: &registry-mirror-vars
registry-mirror-host: ((registry-mirror-host))
registry-mirror-username: ((registry-mirror-username))
registry-mirror-password: ((registry-mirror-password))
resource_types: resource_types:
- name: artifactory-resource - name: artifactory-resource
type: registry-image type: registry-image
@ -255,7 +251,6 @@ jobs:
image: ci-image image: ci-image
vars: vars:
ci-image-name: ci-image ci-image-name: ci-image
<<: *registry-mirror-vars
- task: build-ci-image-jdk11 - task: build-ci-image-jdk11
privileged: true privileged: true
file: git-repo/ci/tasks/build-ci-image.yml file: git-repo/ci/tasks/build-ci-image.yml
@ -263,7 +258,6 @@ jobs:
image: ci-image-jdk11 image: ci-image-jdk11
vars: vars:
ci-image-name: ci-image-jdk11 ci-image-name: ci-image-jdk11
<<: *registry-mirror-vars
- task: build-ci-image-jdk17 - task: build-ci-image-jdk17
privileged: true privileged: true
file: git-repo/ci/tasks/build-ci-image.yml file: git-repo/ci/tasks/build-ci-image.yml
@ -271,7 +265,6 @@ jobs:
image: ci-image-jdk17 image: ci-image-jdk17
vars: vars:
ci-image-name: ci-image-jdk17 ci-image-name: ci-image-jdk17
<<: *registry-mirror-vars
- in_parallel: - in_parallel:
- put: ci-image - put: ci-image
params: params:
@ -566,8 +559,6 @@ jobs:
RELEASE_TYPE: M RELEASE_TYPE: M
GITHUB_USERNAME: ((github-username)) GITHUB_USERNAME: ((github-username))
GITHUB_TOKEN: ((github-ci-release-token)) GITHUB_TOKEN: ((github-ci-release-token))
vars:
<<: *registry-mirror-vars
- put: github-pre-release - put: github-pre-release
params: params:
name: generated-changelog/tag name: generated-changelog/tag
@ -597,8 +588,6 @@ jobs:
RELEASE_TYPE: RC RELEASE_TYPE: RC
GITHUB_USERNAME: ((github-username)) GITHUB_USERNAME: ((github-username))
GITHUB_TOKEN: ((github-ci-release-token)) GITHUB_TOKEN: ((github-ci-release-token))
vars:
<<: *registry-mirror-vars
- put: github-pre-release - put: github-pre-release
params: params:
name: generated-changelog/tag name: generated-changelog/tag
@ -658,8 +647,6 @@ jobs:
RELEASE_TYPE: RELEASE RELEASE_TYPE: RELEASE
GITHUB_USERNAME: ((github-username)) GITHUB_USERNAME: ((github-username))
GITHUB_TOKEN: ((github-ci-release-token)) GITHUB_TOKEN: ((github-ci-release-token))
vars:
<<: *registry-mirror-vars
- put: github-release - put: github-release
params: params:
name: generated-changelog/tag name: generated-changelog/tag

@ -5,10 +5,6 @@ image_resource:
source: source:
repository: concourse/oci-build-task repository: concourse/oci-build-task
tag: 0.9.1 tag: 0.9.1
registry_mirror:
host: ((registry-mirror-host))
username: ((registry-mirror-username))
password: ((registry-mirror-password))
inputs: inputs:
- name: ci-images-git-repo - name: ci-images-git-repo
outputs: outputs:

@ -5,10 +5,6 @@ image_resource:
source: source:
repository: springio/github-changelog-generator repository: springio/github-changelog-generator
tag: '0.0.7' tag: '0.0.7'
registry_mirror:
host: ((registry-mirror-host))
username: ((registry-mirror-username))
password: ((registry-mirror-password))
inputs: inputs:
- name: git-repo - name: git-repo
- name: artifactory-repo - name: artifactory-repo

Loading…
Cancel
Save