From dbdd67ec62c0314c90512f23278caca4bdd0b0a5 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 3 May 2022 15:05:58 +0200 Subject: [PATCH 1/3] Remove outdated docker-image resource from CI The docker-image resource is now replaced by the registry-image resource. --- ci/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 712bd2cac0..ab806e3eaa 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -92,7 +92,7 @@ resources: branch: ((branch)) paths: ["ci/images/*"] - name: ci-image - type: docker-image + type: registry-image icon: docker source: <<: *docker-resource-source From c056b8175344dc06ce1cbebf07d7f9d122053e7c Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 3 May 2022 15:08:14 +0200 Subject: [PATCH 2/3] Upgrade JDK and Ubuntu versions in CI image --- ci/images/ci-image/Dockerfile | 2 +- ci/images/get-jdk-url.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index 37ab9b6edb..2e2c9b9a7d 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220404 +FROM ubuntu:focal-20220415 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 3b0006dd7f..d8dc4e57c0 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -3,16 +3,16 @@ set -e case "$1" in java8) - echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz" + echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz" ;; java11) - echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz" + echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz" ;; java17) - echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz" + echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz" ;; java18) - echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18%2B36/OpenJDK18U-jdk_x64_linux_hotspot_18_36.tar.gz" + echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_x64_linux_hotspot_18.0.1_10.tar.gz" ;; *) echo $"Unknown java version" From 5b1719cd7762dd6756028433ac75326448ed01e0 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 3 May 2022 15:09:23 +0200 Subject: [PATCH 3/3] Upgrade CI to concourse-release-scripts 0.3.4 --- ci/images/setup.sh | 2 -- ci/parameters.yml | 1 + ci/pipeline.yml | 5 +---- ci/scripts/promote-version.sh | 4 ++-- ci/tasks/promote-version.yml | 7 ++++++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ci/images/setup.sh b/ci/images/setup.sh index 6c02f65ef6..f7add2e15c 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/parameters.yml b/ci/parameters.yml index 7f26578d27..2c45862cf4 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -1,5 +1,6 @@ github-repo: "https://github.com/spring-projects/spring-framework.git" github-repo-name: "spring-projects/spring-framework" +sonatype-staging-profile: "org.springframework" docker-hub-organization: "springci" artifactory-server: "https://repo.spring.io" branch: "5.3.x" diff --git a/ci/pipeline.yml b/ci/pipeline.yml index ab806e3eaa..49ee3d0b4d 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -12,7 +12,7 @@ anchors: SONATYPE_USERNAME: ((sonatype-username)) SONATYPE_PASSWORD: ((sonatype-password)) SONATYPE_URL: ((sonatype-url)) - SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id)) + SONATYPE_STAGING_PROFILE: ((sonatype-staging-profile)) artifactory-task-params: &artifactory-task-params ARTIFACTORY_SERVER: ((artifactory-server)) ARTIFACTORY_USERNAME: ((artifactory-username)) @@ -345,7 +345,6 @@ jobs: download_artifacts: false save_build_info: true - task: promote - image: ci-image file: git-repo/ci/tasks/promote-version.yml params: RELEASE_TYPE: M @@ -390,7 +389,6 @@ jobs: download_artifacts: false save_build_info: true - task: promote - image: ci-image file: git-repo/ci/tasks/promote-version.yml params: RELEASE_TYPE: RC @@ -435,7 +433,6 @@ jobs: download_artifacts: true save_build_info: true - task: promote - image: ci-image file: git-repo/ci/tasks/promote-version.yml params: RELEASE_TYPE: RELEASE diff --git a/ci/scripts/promote-version.sh b/ci/scripts/promote-version.sh index 44c5ff626f..2b932f5f20 100755 --- a/ci/scripts/promote-version.sh +++ b/ci/scripts/promote-version.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/promote-version.yml b/ci/tasks/promote-version.yml index abdd8fed5c..bd9b28610d 100644 --- a/ci/tasks/promote-version.yml +++ b/ci/tasks/promote-version.yml @@ -1,5 +1,10 @@ --- platform: linux +image_resource: + type: registry-image + source: + repository: springio/concourse-release-scripts + tag: '0.3.4' inputs: - name: git-repo - name: artifactory-repo @@ -13,6 +18,6 @@ params: SONATYPE_USER: SONATYPE_PASSWORD: SONATYPE_URL: - SONATYPE_STAGING_PROFILE_ID: + SONATYPE_STAGING_PROFILE: run: path: git-repo/ci/scripts/promote-version.sh