Update to latest pipeline definitions

Author: spikymonkey

ci/config-concourse.yml

@@ -1,8 +1,7 @@
+artifactory-server: https://repo.spring.io
+build-name: spring-cloud-app-broker
 ab-slack-success-channel: "#sc-app-broker"
 ab-slack-failure-channel: "#sc-app-broker"
 
-bintray-distribution-repo: spring-cloud-app-broker
-bintray-package: spring-cloud-app-broker
-bintray-repo: jars
-bintray-subject: spring
-build-name: spring-cloud-app-broker
+
+

ci/config/release-scripts.yml

@@ -0,0 +1,10 @@
+logging:
+  level:
+    io.spring.concourse: DEBUG
+spring:
+  main:
+    banner-mode: off
+sonatype:
+  exclude:
+    - 'build-info\.json'
+    - '.*\.zip'

ci/images/app-broker-ci/Dockerfile

@@ -0,0 +1,26 @@
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/library/ubuntu:bionic
+
+RUN apt-get update && apt-get install --no-install-recommends -y ca-certificates net-tools git curl jq gnupg
+
+RUN curl -L https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | apt-key add -
+RUN echo "deb https://packages.cloudfoundry.org/debian stable main" | tee /etc/apt/sources.list.d/cloudfoundry-cli.list
+RUN apt-get update && apt-get install cf-cli
+
+RUN rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME /opt/openjdk
+ENV PATH $JAVA_HOME/bin:$PATH
+RUN mkdir -p /opt/openjdk && \
+    cd /opt/openjdk && \
+    curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz | tar xz --strip-components=1
+
+ADD https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh /opt/
+ADD https://repo.spring.io/libs-release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.3/concourse-release-scripts-0.3.3.jar /opt/
+
+RUN cd /usr/local/bin && curl -L https://github.com/cloudfoundry-incubator/credhub-cli/releases/download/2.9.0/credhub-linux-2.9.0.tgz | tar xz
+
+RUN curl -L https://github.com/cloudfoundry/bosh-bootloader/releases/download/v8.4.43/bbl-v8.4.43_linux_x86-64 --output /usr/local/bin/bbl && \
+    chmod +x /usr/local/bin/bbl
+
+RUN curl -L https://github.com/cloudfoundry/bosh-cli/releases/download/v6.4.4/bosh-cli-6.4.4-linux-amd64 --output /usr/local/bin/bosh && \
+    chmod +x /usr/local/bin/bosh

ci/images/release-ci-image/Dockerfile

@@ -6,23 +6,25 @@ aliases:
       icon_emoji: ":concourse:"
       username: concourse
       channel: ((ab-slack-success-channel))
-      text: "$BUILD_PIPELINE_NAME pipeline has succeeded with build <https://scs.ci.springapps.io/builds/$BUILD_ID|$BUILD_NAME>!"
+      text: "$BUILD_PIPELINE_NAME pipeline has succeeded with build <${ATC_EXTERNAL_URL}/builds/$BUILD_ID|$BUILD_NAME>!"
   - &slack-failure-notification
     put: alert
     params:
       icon_emoji: ":animal-1252:"
       username: concourse
       channel: ((ab-slack-failure-channel))
-      text: <!here> Build <https://scs.ci.springapps.io/builds/$BUILD_ID|$BUILD_NAME> of job $BUILD_JOB_NAME in the $BUILD_PIPELINE_NAME pipeline has failed!
+      text: <!here> Build <${ATC_EXTERNAL_URL}/builds/$BUILD_ID|$BUILD_NAME> of job $BUILD_JOB_NAME in the $BUILD_PIPELINE_NAME pipeline has failed!
 
 jobs:
-  - name: build-release-ci-images
+  - name: build-ci-images
     plan:
       - get: ci-images-git-repo
         trigger: true
-      - put: release-ci-image
+      - put: app-broker-ci-image
         params:
-          build: ci-images-git-repo/ci/images/release-ci-image
+          build: ci-images-git-repo/ci/images/app-broker-ci
+        get_params:
+          skip_download: "true"
 
   - name: build
     serial: true
@@ -34,46 +36,53 @@ jobs:
         timeout: 1h30m
         file: git-repo/ci/tasks/build-project.yml
         vars:
-          docker-hub-organization: ((docker-hub-organization))
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
       - put: artifactory-repo
         params: &artifactory-params
           repo: libs-snapshot-local
           folder: distribution-repository
-          build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
+          build_uri: "${ATC_EXTERNAL_URL}/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
           build_number: "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}"
           disable_checksum_uploads: true
-          artifact_set:
-            - include:
-                - "/**/spring-cloud-app-broker-docs-*.zip"
-              properties:
-                "zip.type": "docs"
-                "zip.deployed": "false"
+    on_failure:
+      *slack-failure-notification
 
   - name: run-acceptance-tests
     serial: true
     plan:
-      - get: git-repo
-        passed: [build]
-        trigger: true
+      - in_parallel:
+        - get: git-repo
+          passed: [build]
+          trigger: true
+        - put: toolsmith-env
+          inputs: []
+          params:
+            action: claim
       - task: acceptance-tests
         file: git-repo/ci/tasks/acceptance-tests.yml
+        vars:
+          ci-image-tag: ((ci-image-tag))
     on_success:
-      *slack-success-notification
+      in_parallel:
+        - *slack-success-notification
+        - put: toolsmith-env
+          params:
+            action: unclaim
+            env_file: toolsmith-env/metadata
+          inputs: [toolsmith-env]
     on_failure:
       *slack-failure-notification
 
   - name: stage-milestone
     serial: true
     plan:
       - get: git-repo
-        trigger: false
         passed: [run-acceptance-tests]
       - task: stage
         file: git-repo/ci/tasks/stage.yml
         vars:
           release-type: M
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
       - put: artifactory-repo
         params:
           <<: *artifactory-params
@@ -86,13 +95,12 @@ jobs:
     serial: true
     plan:
       - get: git-repo
-        trigger: false
         passed: [run-acceptance-tests]
       - task: stage
         file: git-repo/ci/tasks/stage.yml
         vars:
           release-type: RC
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
       - put: artifactory-repo
         params:
           <<: *artifactory-params
@@ -105,13 +113,12 @@ jobs:
     serial: true
     plan:
       - get: git-repo
-        trigger: false
         passed: [run-acceptance-tests]
       - task: stage
         file: git-repo/ci/tasks/stage.yml
         vars:
           release-type: RELEASE
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
       - put: artifactory-repo
         params:
           <<: *artifactory-params
@@ -124,97 +131,78 @@ jobs:
     serial: true
     plan:
       - get: git-repo
-        trigger: false
       - get: artifactory-repo
-        trigger: false
         passed: [stage-milestone]
         params:
           save_build_info: true
       - task: promote
         file: git-repo/ci/tasks/promote.yml
         vars:
           release-type: M
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
 
   - name: promote-rc
     serial: true
     plan:
       - in_parallel:
         - get: git-repo
-          trigger: false
         - get: artifactory-repo
-          trigger: false
           passed: [stage-rc]
           params:
             save_build_info: true
       - task: promote
         file: git-repo/ci/tasks/promote.yml
         vars:
           release-type: RC
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
 
   - name: promote-release
     serial: true
     plan:
       - in_parallel:
         - get: git-repo
-          trigger: false
         - get: artifactory-repo
-          trigger: false
           passed: [stage-release]
           params:
             save_build_info: true
       - task: promote
         file: git-repo/ci/tasks/promote.yml
         vars:
           release-type: RELEASE
-          release-image-tag: ((release-image-tag))
-
-  - name: distribute-release
-    serial: true
-    plan:
-      - in_parallel:
-        - get: git-repo
-          trigger: false
-        - get: artifactory-repo
-          trigger: false
-          passed: [promote-release]
-          params:
-            save_build_info: true
-      - task: distribute
-        file: git-repo/ci/tasks/distribute.yml
-        vars:
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
 
   - name: sync-to-maven-central
     serial: true
     plan:
       - in_parallel:
         - get: git-repo
-          trigger: false
         - get: artifactory-repo
-          trigger: false
-          passed: [distribute-release]
+          passed: [promote-release]
           params:
             save_build_info: true
       - task: sync-to-maven-central
         file: git-repo/ci/tasks/sync-to-maven-central.yml
         vars:
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
 
 resource_types:
   - name: artifactory-resource
-    type: docker-image
+    type: registry-image
     source:
-      repository: springio/artifactory-resource
-      tag: 0.0.12
+      repository: ((dockerhub-mirror-registry))/springio/artifactory-resource
+      tag: 0.0.14
 
   - name: slack-notification
-    type: docker-image
+    type: registry-image
     source:
-      repository: cfcommunity/slack-notification-resource
+      repository: ((dockerhub-mirror-registry))/cfcommunity/slack-notification-resource
       tag: latest
 
+  - name: pcf-pool
+    type: registry-image
+    source:
+      repository: ((dockerhub-mirror-registry))/cftoolsmiths/toolsmiths-envs-resource
+
 resources:
   - name: git-repo
     type: git
@@ -233,11 +221,6 @@ resources:
       username: ((github-username))
       password: ((github-password))
       branch: ((github-username))/staging
-      git_config:
-        - name: user.name
-          value: ((git-username))
-        - name: user.email
-          value: ((git-email))
 
   - name: ci-images-git-repo
     type: git
@@ -246,13 +229,13 @@ resources:
       branch: ((branch))
       paths: ["ci/images/*"]
 
-  - name: release-ci-image
+  - name: app-broker-ci-image
     type: docker-image
     source:
-      repository: ((docker-hub-organization))/release-ci-image
-      username: ((docker-hub-username))
-      password: ((docker-hub-password))
-      tag: ((release-image-tag))
+      repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
+      username: ((corporate-harbor-robot-account.username))
+      password: ((corporate-harbor-robot-account.password))
+      tag: ((ci-image-tag))
 
   - name: artifactory-repo
     type: artifactory-resource
@@ -267,19 +250,32 @@ resources:
     source:
       url: ((scs-slack-webhook))
 
+  - name: toolsmith-env
+    type: pcf-pool
+    icon: pool
+    source:
+      api_token: ((toolsmith-api-token))
+      hostname: environments.toolsmiths.cf-app.com
+      pool_name: cf-deployment
+
 groups:
-  - name: "Main"
+  - name: "build"
     jobs:
       - build
       - run-acceptance-tests
+  - name: "milestone"
+    jobs:
       - stage-milestone
-      - stage-rc
-      - stage-release
       - promote-milestone
+  - name: "rc"
+    jobs:
+      - stage-rc
       - promote-rc
+  - name: "release"
+    jobs:
+      - stage-release
       - promote-release
-      - distribute-release
       - sync-to-maven-central
-  - name: "CI Images"
+  - name: "ci-images"
     jobs:
-      - build-release-ci-images
+      - build-ci-images