Skip to content

Commit b9a2f94

Browse files
committed
Update CI pipeline
1 parent a53dddc commit b9a2f94

File tree

7 files changed

+26
-20
lines changed

7 files changed

+26
-20
lines changed

ci/images/get-jdk-url.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33

44
case "$1" in
55
java17)
6-
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.4.1+1/bellsoft-jdk17.0.4.1+1-linux-amd64.tar.gz"
6+
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz"
77
;;
88
*)
99
echo $"Unknown java version"

ci/images/setup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ rm -rf /var/lib/apt/lists/*
1414

1515
curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh > /opt/concourse-java.sh
1616

17-
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
18-
1917
###########################################################
2018
# JAVA
2119
###########################################################

ci/pipeline.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ anchors:
2121
password: ((github-ci-release-token))
2222
branch: ((branch))
2323
registry-image-resource-source: &registry-image-resource-source
24+
tag: ((milestone))
2425
username: ((docker-hub-username))
2526
password: ((docker-hub-password))
26-
tag: ((milestone))
2727
sontatype-task-params: &sonatype-task-params
2828
SONATYPE_USERNAME: ((sonatype-username))
2929
SONATYPE_PASSWORD: ((sonatype-password))
@@ -38,22 +38,30 @@ resource_types:
3838
type: registry-image
3939
source:
4040
repository: springio/artifactory-resource
41-
tag: 0.0.14
41+
tag: 0.0.18
42+
username: ((docker-hub-username))
43+
password: ((docker-hub-password))
4244
- name: pull-request
4345
type: registry-image
4446
source:
4547
repository: teliaoss/github-pr-resource
4648
tag: v0.23.0
49+
username: ((docker-hub-username))
50+
password: ((docker-hub-password))
4751
- name: github-release
4852
type: registry-image
4953
source:
5054
repository: concourse/github-release-resource
5155
tag: 1.5.5
56+
username: ((docker-hub-username))
57+
password: ((docker-hub-password))
5258
- name: github-status-resource
5359
type: registry-image
5460
source:
5561
repository: dpb587/github-status-resource
5662
tag: master
63+
username: ((docker-hub-username))
64+
password: ((docker-hub-password))
5765
resources:
5866
- name: git-repo
5967
type: git
@@ -213,7 +221,6 @@ jobs:
213221
download_artifacts: false
214222
save_build_info: true
215223
- task: promote
216-
image: ci-image
217224
file: git-repo/ci/tasks/promote.yml
218225
params:
219226
RELEASE_TYPE: M
@@ -262,7 +269,6 @@ jobs:
262269
download_artifacts: false
263270
save_build_info: true
264271
- task: promote
265-
image: ci-image
266272
file: git-repo/ci/tasks/promote.yml
267273
params:
268274
RELEASE_TYPE: RC
@@ -311,7 +317,6 @@ jobs:
311317
download_artifacts: true
312318
save_build_info: true
313319
- task: promote
314-
image: ci-image
315320
file: git-repo/ci/tasks/promote.yml
316321
params:
317322
RELEASE_TYPE: RELEASE

ci/scripts/promote.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ CONFIG_DIR=git-repo/ci/config
66
version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
77
export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json
88

9-
java -jar /opt/concourse-release-scripts.jar \
9+
java -jar /concourse-release-scripts.jar \
1010
--spring.config.location=${CONFIG_DIR}/release-scripts.yml \
1111
publishToCentral $RELEASE_TYPE $BUILD_INFO_LOCATION artifactory-repo || { exit 1; }
1212

13-
java -jar /opt/concourse-release-scripts.jar \
13+
java -jar /concourse-release-scripts.jar \
1414
--spring.config.location=${CONFIG_DIR}/release-scripts.yml \
1515
promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }
1616

ci/tasks/build-ci-image.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ image_resource:
44
type: registry-image
55
source:
66
repository: concourse/oci-build-task
7-
tag: 0.9.1
8-
registry_mirror:
9-
host: ((registry-mirror-host))
10-
username: ((registry-mirror-username))
11-
password: ((registry-mirror-password))
7+
tag: 0.10.0
8+
username: ((docker-hub-username))
9+
password: ((docker-hub-password))
1210
inputs:
1311
- name: ci-images-git-repo
1412
outputs:

ci/tasks/generate-changelog.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ image_resource:
44
type: registry-image
55
source:
66
repository: springio/github-changelog-generator
7-
tag: '0.0.7'
8-
registry_mirror:
9-
host: ((registry-mirror-host))
10-
username: ((registry-mirror-username))
11-
password: ((registry-mirror-password))
7+
tag: '0.0.8'
8+
username: ((docker-hub-username))
9+
password: ((docker-hub-password))
1210
inputs:
1311
- name: git-repo
1412
- name: artifactory-repo

ci/tasks/promote.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
---
22
platform: linux
3+
image_resource:
4+
type: registry-image
5+
source:
6+
repository: springio/concourse-release-scripts
7+
tag: '0.3.4'
8+
username: ((docker-hub-username))
9+
password: ((docker-hub-password))
310
inputs:
411
- name: git-repo
512
- name: artifactory-repo

0 commit comments

Comments
 (0)