From b9a2f94e78bc0b45eb7223245725cdc7fb7f8684 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 9 Mar 2023 12:55:59 -0800 Subject: [PATCH] Update CI pipeline --- ci/images/get-jdk-url.sh | 2 +- ci/images/setup.sh | 2 -- ci/pipeline.yml | 15 ++++++++++----- ci/scripts/promote.sh | 4 ++-- ci/tasks/build-ci-image.yml | 8 +++----- ci/tasks/generate-changelog.yml | 8 +++----- ci/tasks/promote.yml | 7 +++++++ 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index f0bba5a..684835e 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -3,7 +3,7 @@ set -e case "$1" in java17) - echo "https://github.com/bell-sw/Liberica/releases/download/17.0.4.1+1/bellsoft-jdk17.0.4.1+1-linux-amd64.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz" ;; *) echo $"Unknown java version" diff --git a/ci/images/setup.sh b/ci/images/setup.sh index 67422db..f8babb9 100755 --- a/ci/images/setup.sh +++ b/ci/images/setup.sh @@ -14,8 +14,6 @@ rm -rf /var/lib/apt/lists/* curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh > /opt/concourse-java.sh -curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.2/concourse-release-scripts-0.3.2.jar - ########################################################### # JAVA ########################################################### diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 5a4a5a2..633b94d 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -21,9 +21,9 @@ anchors: password: ((github-ci-release-token)) branch: ((branch)) registry-image-resource-source: ®istry-image-resource-source + tag: ((milestone)) username: ((docker-hub-username)) password: ((docker-hub-password)) - tag: ((milestone)) sontatype-task-params: &sonatype-task-params SONATYPE_USERNAME: ((sonatype-username)) SONATYPE_PASSWORD: ((sonatype-password)) @@ -38,22 +38,30 @@ resource_types: type: registry-image source: repository: springio/artifactory-resource - tag: 0.0.14 + tag: 0.0.18 + username: ((docker-hub-username)) + password: ((docker-hub-password)) - name: pull-request type: registry-image source: repository: teliaoss/github-pr-resource tag: v0.23.0 + username: ((docker-hub-username)) + password: ((docker-hub-password)) - name: github-release type: registry-image source: repository: concourse/github-release-resource tag: 1.5.5 + username: ((docker-hub-username)) + password: ((docker-hub-password)) - name: github-status-resource type: registry-image source: repository: dpb587/github-status-resource tag: master + username: ((docker-hub-username)) + password: ((docker-hub-password)) resources: - name: git-repo type: git @@ -213,7 +221,6 @@ jobs: download_artifacts: false save_build_info: true - task: promote - image: ci-image file: git-repo/ci/tasks/promote.yml params: RELEASE_TYPE: M @@ -262,7 +269,6 @@ jobs: download_artifacts: false save_build_info: true - task: promote - image: ci-image file: git-repo/ci/tasks/promote.yml params: RELEASE_TYPE: RC @@ -311,7 +317,6 @@ jobs: download_artifacts: true save_build_info: true - task: promote - image: ci-image file: git-repo/ci/tasks/promote.yml params: RELEASE_TYPE: RELEASE diff --git a/ci/scripts/promote.sh b/ci/scripts/promote.sh index 44c5ff6..2b932f5 100755 --- a/ci/scripts/promote.sh +++ b/ci/scripts/promote.sh @@ -6,11 +6,11 @@ CONFIG_DIR=git-repo/ci/config version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' ) export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json -java -jar /opt/concourse-release-scripts.jar \ +java -jar /concourse-release-scripts.jar \ --spring.config.location=${CONFIG_DIR}/release-scripts.yml \ publishToCentral $RELEASE_TYPE $BUILD_INFO_LOCATION artifactory-repo || { exit 1; } -java -jar /opt/concourse-release-scripts.jar \ +java -jar /concourse-release-scripts.jar \ --spring.config.location=${CONFIG_DIR}/release-scripts.yml \ promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; } diff --git a/ci/tasks/build-ci-image.yml b/ci/tasks/build-ci-image.yml index 25228e8..5cb819a 100644 --- a/ci/tasks/build-ci-image.yml +++ b/ci/tasks/build-ci-image.yml @@ -4,11 +4,9 @@ image_resource: type: registry-image source: repository: concourse/oci-build-task - tag: 0.9.1 - registry_mirror: - host: ((registry-mirror-host)) - username: ((registry-mirror-username)) - password: ((registry-mirror-password)) + tag: 0.10.0 + username: ((docker-hub-username)) + password: ((docker-hub-password)) inputs: - name: ci-images-git-repo outputs: diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml index 48efb9f..dc38cf4 100644 --- a/ci/tasks/generate-changelog.yml +++ b/ci/tasks/generate-changelog.yml @@ -4,11 +4,9 @@ image_resource: type: registry-image source: repository: springio/github-changelog-generator - tag: '0.0.7' - registry_mirror: - host: ((registry-mirror-host)) - username: ((registry-mirror-username)) - password: ((registry-mirror-password)) + tag: '0.0.8' + username: ((docker-hub-username)) + password: ((docker-hub-password)) inputs: - name: git-repo - name: artifactory-repo diff --git a/ci/tasks/promote.yml b/ci/tasks/promote.yml index f6e496f..22e9b68 100644 --- a/ci/tasks/promote.yml +++ b/ci/tasks/promote.yml @@ -1,5 +1,12 @@ --- platform: linux +image_resource: + type: registry-image + source: + repository: springio/concourse-release-scripts + tag: '0.3.4' + username: ((docker-hub-username)) + password: ((docker-hub-password)) inputs: - name: git-repo - name: artifactory-repo