From 25e73633bbf37ed83eaf55e4e3f1df410e28776d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 14 Jun 2019 22:00:58 -0700 Subject: [PATCH 1/2] Update CI credhub references --- ci/pipeline.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 2fd4654378..7bb3b74946 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -32,7 +32,7 @@ resources: type: pull-request icon: source-pull source: - access_token: ((github-access-token)) + access_token: ((github-ci-pull-request-token)) repo: ((github-repo-name)) base: ((branch)) ignore_paths: ["ci/*"] @@ -42,7 +42,7 @@ resources: source: owner: spring-projects repository: spring-boot - access_token: ((github-release-notes-access-token)) + access_token: ((github-ci-release-token)) pre_release: true - name: github-release type: github-release @@ -50,7 +50,7 @@ resources: source: owner: spring-projects repository: spring-boot - access_token: ((github-release-notes-access-token)) + access_token: ((github-ci-release-token)) pre_release: false - name: ci-images-git-repo type: git @@ -96,7 +96,7 @@ resources: icon: eye-check-outline source: repository: ((github-repo-name)) - access_token: ((github-access-token)) + access_token: ((github-ci-status-token)) branch: ((branch)) context: build - name: repo-status-jdk9-build @@ -104,7 +104,7 @@ resources: icon: eye-check-outline source: repository: ((github-repo-name)) - access_token: ((github-access-token)) + access_token: ((github-ci-status-token)) branch: ((branch)) context: jdk9-build - name: repo-status-jdk10-build @@ -112,7 +112,7 @@ resources: icon: eye-check-outline source: repository: ((github-repo-name)) - access_token: ((github-access-token)) + access_token: ((github-ci-status-token)) branch: ((branch)) context: jdk10-build - name: slack-alert @@ -409,7 +409,7 @@ jobs: params: RELEASE_TYPE: M GITHUB_USERNAME: ((github-username)) - GITHUB_TOKEN: ((github-release-notes-access-token)) + GITHUB_TOKEN: ((github-ci-release-token)) - put: github-pre-release params: name: generated-release-notes/tag @@ -439,7 +439,7 @@ jobs: params: RELEASE_TYPE: RC GITHUB_USERNAME: ((github-username)) - GITHUB_TOKEN: ((github-release-notes-access-token)) + GITHUB_TOKEN: ((github-ci-release-token)) - put: github-pre-release params: name: generated-release-notes/tag @@ -493,7 +493,7 @@ jobs: params: RELEASE_TYPE: RELEASE GITHUB_USERNAME: ((github-username)) - GITHUB_TOKEN: ((github-release-notes-access-token)) + GITHUB_TOKEN: ((github-ci-release-token)) - put: github-release params: name: generated-release-notes/tag From 53ba37e3e1316a1996683d2e446e8eff3147a72f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 14 Jun 2019 22:39:03 -0700 Subject: [PATCH 2/2] Update CI readme --- ci/README.adoc | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/ci/README.adoc b/ci/README.adoc index 50664363c7..8004876f6e 100644 --- a/ci/README.adoc +++ b/ci/README.adoc @@ -1,37 +1,18 @@ == Concourse pipeline +Ensure that you've have a spring-boot target logged in + +[source] +---- +$ fly -t spring-boot login -n spring-boot -c https://ci.spring-io +---- + The pipeline can be deployed using the following command: [source] ---- -$ fly -t spring set-pipeline -p spring-boot-2.0.x -c ci/pipeline.yml -l ci/parameters.yml +$ fly -t spring-boot set-pipeline -p spring-boot-2.0.x -c ci/pipeline.yml -l ci/parameters.yml ---- NOTE: This assumes that you have credhub integration configured with the appropriate secrets. - -=== Release - -To release a milestone: - -[source] ----- -$ fly -t spring trigger-job -j spring-boot-2.0.x/stage-milestone -$ fly -t spring trigger-job -j spring-boot-2.0.x/promote-milestone ----- - -To release an RC: - -[source] ----- -$ fly -t spring trigger-job -j spring-boot-2.0.x/stage-rc -$ fly -t spring trigger-job -j spring-boot-2.0.x/promote-rc ----- - -To release a GA: - -[source] ----- -$ fly -t spring trigger-job -j spring-boot-2.0.x/stage-release -$ fly -t spring trigger-job -j spring-boot-2.0.x/promote-release -----