Update CI pipeline

This commit is contained in:
Phillip Webb 2023-02-02 16:04:34 -08:00
parent 86fc39261e
commit d71d885021
3 changed files with 4 additions and 22 deletions

View File

@ -11,8 +11,6 @@ anchors:
username: ((docker-hub-username)) username: ((docker-hub-username))
password: ((docker-hub-password)) password: ((docker-hub-password))
tag: ((milestone)) tag: ((milestone))
registry_mirror:
host: ((docker-hub-mirror))
gradle-enterprise-task-params: &gradle-enterprise-task-params gradle-enterprise-task-params: &gradle-enterprise-task-params
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_CACHE_URL: ((gradle_enterprise_cache_url)) GRADLE_ENTERPRISE_CACHE_URL: ((gradle_enterprise_cache_url))
@ -95,8 +93,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))
docker-hub-mirror-vars: &docker-hub-mirror-vars
docker-hub-mirror: ((docker-hub-mirror))
resource_types: resource_types:
- name: registry-image - name: registry-image
type: registry-image type: registry-image
@ -287,7 +283,6 @@ jobs:
image: ci-image image: ci-image
vars: vars:
ci-image-name: ci-image ci-image-name: ci-image
<<: *docker-hub-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
@ -295,7 +290,6 @@ jobs:
image: ci-image-jdk11 image: ci-image-jdk11
vars: vars:
ci-image-name: ci-image-jdk11 ci-image-name: ci-image-jdk11
<<: *docker-hub-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
@ -303,7 +297,6 @@ jobs:
image: ci-image-jdk17 image: ci-image-jdk17
vars: vars:
ci-image-name: ci-image-jdk17 ci-image-name: ci-image-jdk17
<<: *docker-hub-mirror-vars
- task: build-ci-image-jdk19 - task: build-ci-image-jdk19
privileged: true privileged: true
file: git-repo/ci/tasks/build-ci-image.yml file: git-repo/ci/tasks/build-ci-image.yml
@ -311,7 +304,6 @@ jobs:
image: ci-image-jdk19 image: ci-image-jdk19
vars: vars:
ci-image-name: ci-image-jdk19 ci-image-name: ci-image-jdk19
<<: *docker-hub-mirror-vars
- in_parallel: - in_parallel:
- put: ci-image - put: ci-image
params: params:
@ -647,8 +639,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:
<<: *docker-hub-mirror-vars
- put: github-pre-release - put: github-pre-release
params: params:
name: generated-changelog/tag name: generated-changelog/tag
@ -678,8 +668,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:
<<: *docker-hub-mirror-vars
- put: github-pre-release - put: github-pre-release
params: params:
name: generated-changelog/tag name: generated-changelog/tag
@ -739,8 +727,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:
<<: *docker-hub-mirror-vars
- put: github-release - put: github-release
params: params:
name: generated-changelog/tag name: generated-changelog/tag

View File

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

View File

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