diff --git a/ci/images/setup.sh b/ci/images/setup.sh index 32a332c7..0e9d9d95 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 22e13357..b9ac2820 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -239,10 +239,10 @@ jobs: download_artifacts: true save_build_info: true - task: promote - image: ci-image file: git-repo/ci/tasks/promote.yml params: RELEASE_TYPE: RELEASE + <<: *registry-image-resource-source <<: *artifactory-task-params <<: *sonatype-task-params - name: create-github-release diff --git a/ci/scripts/promote.sh b/ci/scripts/promote.sh index 44c5ff62..bd160019 100755 --- a/ci/scripts/promote.sh +++ b/ci/scripts/promote.sh @@ -1,16 +1,15 @@ #!/bin/bash -source $(dirname $0)/common.sh 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/promote.yml b/ci/tasks/promote.yml index 9db3f878..90edcaa6 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