Merge branch '2.0.x' into 2.1.x

Author: philwebb

ci/README.adoc

@@ -1,37 +1,18 @@
 == Concourse pipeline
 
-The pipeline can be deployed using the following command:
+Ensure that you've have a spring-boot target logged in
 
 [source]
 ----
-$ fly -t spring set-pipeline -p spring-boot-2.1.x -c ci/pipeline.yml -l ci/parameters.yml
+$ fly -t spring-boot login -n spring-boot -c https://ci.spring-io
 ----
 
-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.1.x/stage-milestone
-$ fly -t spring trigger-job -j spring-boot-2.1.x/promote-milestone
-----
-
-To release an RC:
+The pipeline can be deployed using the following command:
 
 [source]
 ----
-$ fly -t spring trigger-job -j spring-boot-2.1.x/stage-rc
-$ fly -t spring trigger-job -j spring-boot-2.1.x/promote-rc
+$ fly -t spring-boot set-pipeline -p spring-boot-2.1.x -c ci/pipeline.yml -l ci/parameters.yml
 ----
 
-To release a GA:
-
-[source]
-----
-$ fly -t spring trigger-job -j spring-boot-2.1.x/stage-release
-$ fly -t spring trigger-job -j spring-boot-2.1.x/promote-release
-----
+NOTE: This assumes that you have credhub integration configured with the appropriate
+secrets.

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,15 +42,15 @@ 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
   icon: briefcase-download
   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,23 +96,23 @@ 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-jdk11-build
   type: github-status-resource
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
-    access_token: ((github-access-token))
+    access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
 - name: repo-status-jdk12-build
   type: github-status-resource
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
-    access_token: ((github-access-token))
+    access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk12-build
 - name: slack-alert
@@ -450,7 +450,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
@@ -481,7 +481,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
@@ -537,7 +537,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