From 64d81754794024ef2cb17397198748a06bef4140 Mon Sep 17 00:00:00 2001 From: Dylan Roberts Date: Fri, 16 Apr 2021 12:08:09 -0400 Subject: [PATCH] Update ci for harbor and runway (cherry picked from commit 1e8aeca6f5b0af63d6a000d7128783e9a5e7586c) --- ci/pipeline.yml | 29 +++++++++++++++++++---------- ci/pr-pipeline.yml | 8 ++++---- ci/tasks/build-project.yml | 2 +- ci/tasks/distribute.yml | 2 +- ci/tasks/promote.yml | 2 +- ci/tasks/stage.yml | 2 +- ci/tasks/sync-to-maven-central.yml | 2 +- 7 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 333831e..b7f1e7c 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -6,14 +6,14 @@ aliases: icon_emoji: ":concourse:" username: concourse channel: ((ab-slack-success-channel)) - text: "$BUILD_PIPELINE_NAME pipeline has succeeded with build !" + 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: Build of job $BUILD_JOB_NAME in the $BUILD_PIPELINE_NAME pipeline has failed! + text: 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 @@ -23,6 +23,8 @@ jobs: - put: release-ci-image params: build: ci-images-git-repo/ci/images/release-ci-image + get_params: + skip_download: "true" - name: build serial: true @@ -34,13 +36,13 @@ jobs: timeout: 1h30m file: git-repo/ci/tasks/build-project.yml vars: - docker-hub-organization: ((docker-hub-organization)) + docker-hub-organization: ((dockerhub-organization)) release-image-tag: ((release-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: @@ -56,8 +58,8 @@ jobs: - get: git-repo passed: [build] trigger: true - - task: acceptance-tests - file: git-repo/ci/tasks/acceptance-tests.yml +# - task: acceptance-tests +# file: git-repo/ci/tasks/acceptance-tests.yml on_success: *slack-success-notification on_failure: @@ -213,13 +215,20 @@ resource_types: - name: artifactory-resource type: registry-image source: - repository: springio/artifactory-resource + repository: ((dockerhub-mirror-registry))/springio/artifactory-resource tag: 0.0.12 - name: slack-notification type: registry-image source: - repository: cfcommunity/slack-notification-resource + repository: ((dockerhub-mirror-registry))/cfcommunity/slack-notification-resource + tag: latest + + - name: docker-image-mirror + type: registry-image + privileged: true + source: + repository: ((dockerhub-mirror-registry))/concourse/docker-image-resource tag: latest resources: @@ -249,9 +258,9 @@ resources: paths: ["ci/images/*"] - name: release-ci-image - type: docker-image + type: docker-image-mirror source: - repository: ((corporate-harbor-registry))/((docker-hub-organization))/release-ci-image + repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image username: ((corporate-harbor-robot-account.username)) password: ((corporate-harbor-robot-account.password)) tag: ((release-image-tag)) diff --git a/ci/pr-pipeline.yml b/ci/pr-pipeline.yml index 69522b9..1bf9c63 100644 --- a/ci/pr-pipeline.yml +++ b/ci/pr-pipeline.yml @@ -6,14 +6,14 @@ aliases: icon_emoji: ":concourse:" username: concourse channel: ((ab-slack-success-channel)) - text: "$BUILD_PIPELINE_NAME pipeline has succeeded with build !" + 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: Build of job $BUILD_JOB_NAME in the $BUILD_PIPELINE_NAME pipeline has failed! + text: 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 @@ -27,7 +27,7 @@ jobs: input_mapping: git-repo: pull-request vars: - docker-hub-organization: ((docker-hub-organization)) + docker-hub-organization: ((dockerhub-organization)) release-image-tag: ((release-image-tag)) - name: run-acceptance-tests @@ -54,7 +54,7 @@ resource_types: - name: slack-notification type: registry-image source: - repository: cfcommunity/slack-notification-resource + repository: ((dockerhub-mirror-registry))/cfcommunity/slack-notification-resource tag: latest resources: diff --git a/ci/tasks/build-project.yml b/ci/tasks/build-project.yml index 9b4ec3b..478d08c 100644 --- a/ci/tasks/build-project.yml +++ b/ci/tasks/build-project.yml @@ -3,7 +3,7 @@ platform: linux image_resource: type: registry-image source: - repository: ((corporate-harbor-registry))/((docker-hub-organization))/release-ci-image + repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image tag: ((release-image-tag)) inputs: - name: git-repo diff --git a/ci/tasks/distribute.yml b/ci/tasks/distribute.yml index 1055f5f..4cd0d1b 100644 --- a/ci/tasks/distribute.yml +++ b/ci/tasks/distribute.yml @@ -3,7 +3,7 @@ platform: linux image_resource: type: registry-image source: - repository: ((corporate-harbor-registry))/((docker-hub-organization))/release-ci-image + repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image tag: ((release-image-tag)) inputs: - name: git-repo diff --git a/ci/tasks/promote.yml b/ci/tasks/promote.yml index 7c497b5..769604c 100644 --- a/ci/tasks/promote.yml +++ b/ci/tasks/promote.yml @@ -3,7 +3,7 @@ platform: linux image_resource: type: registry-image source: - repository: ((corporate-harbor-registry))/((docker-hub-organization))/release-ci-image + repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image tag: ((release-image-tag)) inputs: - name: git-repo diff --git a/ci/tasks/stage.yml b/ci/tasks/stage.yml index 77e3398..969f7fe 100644 --- a/ci/tasks/stage.yml +++ b/ci/tasks/stage.yml @@ -3,7 +3,7 @@ platform: linux image_resource: type: registry-image source: - repository: ((corporate-harbor-registry))/((docker-hub-organization))/release-ci-image + repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image tag: ((release-image-tag)) inputs: - name: git-repo diff --git a/ci/tasks/sync-to-maven-central.yml b/ci/tasks/sync-to-maven-central.yml index 0a3156d..a21bcd4 100644 --- a/ci/tasks/sync-to-maven-central.yml +++ b/ci/tasks/sync-to-maven-central.yml @@ -3,7 +3,7 @@ platform: linux image_resource: type: registry-image source: - repository: ((corporate-harbor-registry))/((docker-hub-organization))/release-ci-image + repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image tag: ((release-image-tag)) inputs: - name: git-repo