diff --git a/ci/parameters.yml b/ci/parameters.yml index 2ab85827b14f..54d5700c5594 100644 --- 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 index d3dc323beb78..784de17d411a 100644 --- 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: ®istry-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,7 +251,6 @@ 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 @@ -263,7 +258,6 @@ jobs: 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 @@ -271,7 +265,6 @@ jobs: 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 index 25228e848f3a..c7af47efdd3f 100644 --- 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 index 4927fbf86cf7..b3f40278c8e6 100755 --- 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