Drop CI registry mirror settings

spring-projects · Nov 19, 2021 · e9beac6 · e9beac6
1 parent b6d0b44
commit e9beac6
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 24 deletions.
diff --git a/ci/parameters.yml b/ci/parameters.yml
@@ -11,6 +11,3 @@ milestone: "2.6.x"
 build-name: "spring-boot"
 concourse-url: "https://ci.spring.io"
 task-timeout: 2h00m
-registry-mirror-host: docker.repo.spring.io
-registry-mirror-username: ((artifactory-username))
-registry-mirror-password: ((artifactory-password))
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -88,10 +88,6 @@ anchors:
   gradle-publish-params: &gradle-publish-params
     GRADLE_PUBLISH_KEY: ((gradle-publish-key))
     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:
 - name: artifactory-resource
   type: registry-image
@@ -255,23 +251,20 @@ jobs:
         image: ci-image
       vars:
         ci-image-name: ci-image
-        <<: *registry-mirror-vars
     - task: build-ci-image-jdk11
       privileged: true
       file: git-repo/ci/tasks/build-ci-image.yml
       output_mapping:
         image: ci-image-jdk11
       vars:
         ci-image-name: ci-image-jdk11
-        <<: *registry-mirror-vars
     - task: build-ci-image-jdk17
       privileged: true
       file: git-repo/ci/tasks/build-ci-image.yml
       output_mapping:
         image: ci-image-jdk17
       vars:
         ci-image-name: ci-image-jdk17
-        <<: *registry-mirror-vars
   - in_parallel:
     - put: ci-image
       params:
@@ -566,8 +559,6 @@ jobs:
       RELEASE_TYPE: M
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
-    vars:
-      <<: *registry-mirror-vars
   - put: github-pre-release
     params:
       name: generated-changelog/tag
@@ -597,8 +588,6 @@ jobs:
       RELEASE_TYPE: RC
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
-    vars:
-      <<: *registry-mirror-vars
   - put: github-pre-release
     params:
       name: generated-changelog/tag
@@ -658,8 +647,6 @@ jobs:
       RELEASE_TYPE: RELEASE
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
-    vars:
-      <<: *registry-mirror-vars
   - put: github-release
     params:
       name: generated-changelog/tag

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

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