Skip to content

Commit 8a51619

Browse files
committed
Switch to concourse-release-scripts image
The jar file is no longer publicly available.
1 parent 6f2453a commit 8a51619

File tree

6 files changed

+10
-23
lines changed

6 files changed

+10
-23
lines changed

ci/images/app-broker-ci/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ RUN apt-get update && \
3131
apt-get clean
3232

3333
ADD "https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v$CONCOURSE_JAVA_SCRIPTS_VERSION/concourse-java.sh" /opt/
34-
ADD "https://repo.spring.io/ui/native/snapshot/io/spring/concourse/releasescripts/concourse-release-scripts/$CONCOURSE_RELEASE_SCRIPTS_VERSION/concourse-release-scripts-$CONCOURSE_RELEASE_SCRIPTS_VERSION.jar" /opt/
3534

3635
RUN cd /usr/local/bin && curl -L "https://github.com/cloudfoundry-incubator/credhub-cli/releases/download/$CREDHUB_CLI_VERSION/credhub-linux-$CREDHUB_CLI_VERSION.tgz" | tar xz
3736

ci/pipeline.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ jobs:
187187
file: git-repo/ci/tasks/promote.yml
188188
vars:
189189
release-type: M
190-
ci-image-tag: ((ci-image-tag))
191190

192191
- name: promote-rc
193192
serial: true
@@ -202,7 +201,6 @@ jobs:
202201
file: git-repo/ci/tasks/promote.yml
203202
vars:
204203
release-type: RC
205-
ci-image-tag: ((ci-image-tag))
206204

207205
- name: promote-release
208206
serial: true
@@ -217,7 +215,6 @@ jobs:
217215
file: git-repo/ci/tasks/promote.yml
218216
vars:
219217
release-type: RELEASE
220-
ci-image-tag: ((ci-image-tag))
221218

222219
- name: sync-to-maven-central
223220
serial: true
@@ -230,8 +227,6 @@ jobs:
230227
save_build_info: true
231228
- task: sync-to-maven-central
232229
file: git-repo/ci/tasks/sync-to-maven-central.yml
233-
vars:
234-
ci-image-tag: ((ci-image-tag))
235230

236231
resource_types:
237232
- name: artifactory-resource

ci/scripts/promote.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
#!/bin/bash
22
set -euo pipefail
33

4-
# shellcheck source=scripts/common.sh
5-
source $(dirname $0)/common.sh
4+
readonly BUILD_INFO_LOCATION="$(pwd)/artifactory-repo/build-info.json"
5+
readonly VERSION=$( jq -r '.buildInfo.modules[0].id' < "$BUILD_INFO_LOCATION" | sed 's/.*:.*:\(.*\)/\1/' )
66

7-
version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
8-
export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json
9-
10-
java -jar /opt/concourse-release-scripts*.jar promote $RELEASE_TYPE $BUILD_INFO_LOCATION
7+
java -jar /concourse-release-scripts.jar promote "$RELEASE_TYPE" "$BUILD_INFO_LOCATION"
118

129
echo "Promotion complete"
13-
echo $version > version/version
10+
echo "$VERSION" > version/version

ci/scripts/sync-to-maven-central.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -euo pipefail
44
readonly BUILD_INFO_LOCATION="$(pwd)/artifactory-repo/build-info.json"
55
readonly CONFIG_DIR="$(pwd)/git-repo/ci/config"
66

7-
java -jar /opt/concourse-release-scripts*.jar \
8-
--spring.config.location="${CONFIG_DIR}/release-scripts.yml" \
7+
java -jar /concourse-release-scripts.jar \
8+
--spring.config.location="$CONFIG_DIR/release-scripts.yml" \
99
publishToCentral 'RELEASE' "$BUILD_INFO_LOCATION" "artifactory-repo"
1010

1111
echo "Sync complete"

ci/tasks/promote.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ platform: linux
33
image_resource:
44
type: registry-image
55
source:
6-
repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
7-
username: ((corporate-harbor-robot-account.username))
8-
password: ((corporate-harbor-robot-account.password))
9-
tag: ((ci-image-tag))
6+
repository: ((dockerhub-mirror-registry))/springio/concourse-release-scripts
7+
tag: '0.3.4'
108
inputs:
119
- name: git-repo
1210
- name: artifactory-repo

ci/tasks/sync-to-maven-central.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ platform: linux
33
image_resource:
44
type: registry-image
55
source:
6-
repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
7-
username: ((corporate-harbor-robot-account.username))
8-
password: ((corporate-harbor-robot-account.password))
9-
tag: ((ci-image-tag))
6+
repository: ((dockerhub-mirror-registry))/springio/concourse-release-scripts
7+
tag: '0.3.4'
108
inputs:
119
- name: git-repo
1210
- name: artifactory-repo

0 commit comments

Comments
 (0)