From 7ccffcf5d076aca555f13541dd7f480ec38af5e2 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 27 Nov 2017 12:50:18 -0800 Subject: [PATCH] Add build jobs for boot-properties and boot-java vscode RC's --- concourse/pipeline.yml | 140 ++++++++++++++++++++++++++++----- concourse/release-pipeline.yml | 119 ---------------------------- 2 files changed, 122 insertions(+), 137 deletions(-) delete mode 100644 concourse/release-pipeline.yml diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 13158dbdc..94e541e09 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -416,6 +416,8 @@ jobs: - build-manifest-yaml-vsix-snapshot - build-consourse-vsix-snapshot - build-bosh-vsix-snapshot + - build-boot-java-vsix-snapshot + - build-boot-properties-vsix-snapshot - do: - get: version params: @@ -618,6 +620,74 @@ jobs: text: | Build ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has succeed! Release candidate available for testing $TEXT_FILE_CONTENT +- name: build-boot-properties-rc + plan: + - aggregate: + - get: maven-cache + passed: + - build-boot-properties-vsix-snapshot + - get: sts4 + passed: + - trigger-rc-build + - get: version + trigger: true + passed: + - trigger-rc-build + - task: build-boot-properties-rc + file: sts4/concourse/tasks/rc-build.yml + params: + extension_id: vscode-boot-properties + on_failure: + put: slack-notification + params: + text: | + Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed! + - put: s3-boot-properties-vsix-snapshot + params: + file: out/vscode-*.vsix + acl: public-read + on_success: + put: slack-notification + params: + text_file: s3-boot-properties-vsix-snapshot/url + icon_url: https://raw.githubusercontent.com/spring-projects/sts4/master/vscode-extensions/vscode-boot-properties/spring-boot-logo.png + text: | + Build ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has succeed! + Release candidate available for testing $TEXT_FILE_CONTENT +- name: build-boot-java-rc + plan: + - aggregate: + - get: maven-cache + passed: + - build-boot-java-vsix-snapshot + - get: sts4 + passed: + - trigger-rc-build + - get: version + trigger: true + passed: + - trigger-rc-build + - task: build-boot-java-rc + file: sts4/concourse/tasks/rc-build.yml + params: + extension_id: vscode-boot-java + on_failure: + put: slack-notification + params: + text: | + Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed! + - put: s3-boot-java-vsix-snapshot + params: + file: out/vscode-*.vsix + acl: public-read + on_success: + put: slack-notification + params: + text_file: s3-boot-java-vsix-snapshot/url + icon_url: https://raw.githubusercontent.com/spring-projects/sts4/master/vscode-extensions/vscode-boot-java/spring-boot-logo.png + text: | + Build ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has succeed! + Release candidate available for testing $TEXT_FILE_CONTENT - name: publish-release serial: true plan: @@ -628,6 +698,17 @@ jobs: - build-manifest-yaml-rc - build-concourse-rc - build-bosh-rc + - build-boot-properties-rc + - build-boot-java-rc + - get: version + passed: + - build-concourse-rc + - build-manifest-yaml-rc + - build-bosh-rc + - build-boot-java-rc + - build-boot-properties-rc + params: + bump: final - get: s3-concourse-vsix-snapshot passed: - build-concourse-rc @@ -637,13 +718,12 @@ jobs: - get: s3-bosh-vsix-snapshot passed: - build-bosh-rc - - get: version + - get: s3-boot-properties-vsix-snapshot passed: - - build-concourse-rc - - build-manifest-yaml-rc - - build-bosh-rc - params: - bump: final + - build-boot-properties-rc + - get: s3-boot-java-vsix-snapshot + passed: + - build-boot-java-rc - task: publish-vsix-releases file: tasks/concourse/tasks/publish-vsix-releases.yml input_mapping: @@ -693,6 +773,23 @@ jobs: - put: version params: file: version/version +- name: bump-version-minor + serial: true + plan: + - aggregate: + - get: sts4 + - get: version + params: + bump: minor + - task: bump-versions + file: sts4/concourse/tasks/bump-versions.yml + - put: sts4 + params: + repository: out + rebase: true + - put: version + params: + file: version/version - name: post-release serial: true plan: @@ -974,18 +1071,6 @@ jobs: text: | Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed! groups: -- name: vscode-release - jobs: - - build-bosh-rc - - build-concourse-rc - - build-manifest-yaml-rc - - trigger-rc-build - - publish-release - - post-release - - build-manifest-yaml-vsix-snapshot - - build-consourse-vsix-snapshot - - build-bosh-vsix-snapshot - - bump-version-patch - name: vscode-snapshot jobs: - build-vscode-snapshot-website @@ -994,6 +1079,25 @@ groups: - build-boot-java-vsix-snapshot - build-bosh-vsix-snapshot - build-manifest-yaml-vsix-snapshot +- name: vscode-release + jobs: + - build-bosh-rc + - build-concourse-rc + - build-manifest-yaml-rc + - build-boot-java-rc + - build-boot-properties-rc + - trigger-rc-build + - publish-release + - post-release + - build-manifest-yaml-vsix-snapshot + - build-consourse-vsix-snapshot + - build-bosh-vsix-snapshot + - build-boot-java-vsix-snapshot + - build-boot-properties-vsix-snapshot +- name: bump-versions + jobs: + - bump-version-patch + - bump-version-minor - name: atom jobs: - build-atom-snapshot-website diff --git a/concourse/release-pipeline.yml b/concourse/release-pipeline.yml deleted file mode 100644 index 39235b957..000000000 --- a/concourse/release-pipeline.yml +++ /dev/null @@ -1,119 +0,0 @@ -resource_types: -- name: slack-notification - type: docker-image - source: - repository: cfcommunity/slack-notification-resource - tag: latest -################################################### -resources: -- name: sts4-out - type: git - source: - uri: git@github.com:spring-projects/sts4.git - branch: {{branch}} - private_key: {{rsa_id}} -- name: sts4 - type: git - source: - uri: git@github.com:spring-projects/sts4.git - branch: {{branch}} - private_key: {{rsa_id}} - tag_filter: vscode-manifest-yaml-*-RC* -- name: s3-vscode-manifest-yaml-vsix - type: s3 - source: - bucket: {{s3_bucket}} - access_key_id: {{s3_accesskey}} - secret_access_key: {{s3_secretkey}} - region_name: {{s3_region}} - regexp: sts4/vscode-extensions/releases/vscode-manifest-yaml-(.*).vsix -- name: slack-notification - type: slack-notification - source: - url: https://hooks.slack.com/services/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 -###################################################### -jobs: -- name: build-vscode-manifest-yaml-release - plan: - - get: sts4 - trigger: true - - task: build-vsix - file: sts4/concourse/tasks/build-vsix.yml - params: - extension_id: vscode-manifest-yaml - dist_type: release - on_failure: - put: slack-notification - params: - channel: "@kdvolder" - text: | - Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed! - - put: s3-vscode-manifest-yaml-vsix - params: - file: out/*.vsix - acl: public-read - on_success: - put: slack-notification - params: - text_file: s3-vscode-manifest-yaml-vsix/url - icon_url: https://raw.githubusercontent.com/spring-projects/sts4/master/vscode-extensions/vscode-manifest-yaml/icon.png - text: | - Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has succeed! - Release candidate available for testing $TEXT_FILE_CONTENT -- name: publish-vscode-manifest-yaml-release - plan: - - do: - - get: sts4 - passed: - - build-vscode-manifest-yaml-release - - get: s3-vscode-manifest-yaml-vsix - passed: - - build-vscode-manifest-yaml-release - - task: publish-vscode-manifest-yaml-release - file: sts4/concourse/tasks/vsce-publish.yml - input_mapping: - vsix-resource: s3-vscode-manifest-yaml-vsix - params: - vsce_publisher: {{vsce_publisher}} - vsce_token: {{vsce_token}} - extension_id: vscode-manifest-yaml - - put: sts4-out - params: - repository: sts4-out - only_tag: true - on_success: - put: slack-notification - params: - text_file: s3-vscode-manifest-yaml-vsix/version - icon_url: https://raw.githubusercontent.com/spring-projects/sts4/master/vscode-extensions/vscode-manifest-yaml/icon.png - text: | - Vscode-manifest-yaml **${TEXT_FILE_CONTENT}** was **released** to [Vscode Marktetplace](https://marketplace.visualstudio.com/items?itemName=Pivotal.vscode-manifest-yaml) - on_failure: - put: slack-notification - params: - channel: "@kdvolder" - text: | - Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed! -- name: bump-vscode-manifest-yaml-version - serial: true - plan: - - do: - - get: sts4 - trigger: true - passed: - - publish-vscode-manifest-yaml-release - - task: bump-vscode-manifest-yaml-version - file: sts4/concourse/tasks/bump-version.yml - params: - extension_id: vscode-manifest-yaml - - put: sts4-out - timeout: 5m - params: - repository: sts4-out - rebase: true - on_failure: - put: slack-notification - params: - channel: "@kdvolder" - text: | - Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!