From d59b81487de98b022b4c694fc9ea2e93bab0651a Mon Sep 17 00:00:00 2001 From: Irfan Habib Date: Mon, 20 Aug 2018 11:10:05 +0100 Subject: [PATCH 1/2] Add commit hashes to releases --- deploy/ci/console-dev-releases.yml | 10 ++++------ deploy/ci/console-nightly-releases.yml | 4 ---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml index ef545e3a9e..b1dc17237c 100644 --- a/deploy/ci/console-dev-releases.yml +++ b/deploy/ci/console-dev-releases.yml @@ -100,6 +100,7 @@ jobs: build_args_file: image-tag/build-args patch_base_reg: ((patch-base-reg)) patch_base_tag: ((patch-base-tag)) + tag_commit: "true" - put: postflight-image params: dockerfile: stratos/deploy/Dockerfile.bk @@ -108,23 +109,20 @@ jobs: tag: image-tag/v2-alpha-tag patch_base_reg: ((patch-base-reg)) patch_base_tag: ((patch-base-tag)) - - put: mariadb-image - params: + tag_commit: "true" dockerfile: stratos/deploy/db/Dockerfile.mariadb build: stratos/deploy/db tag: image-tag/v2-alpha-tag patch_base_reg: ((patch-base-reg)) patch_base_tag: ((patch-base-tag)) - - put: ui-image - params: + tag_commit: "true" dockerfile: stratos/deploy/Dockerfile.ui build: stratos/ target_name: prod-build tag: image-tag/v2-alpha-tag patch_base_reg: ((patch-base-reg)) patch_base_tag: ((patch-base-tag)) -- name: create-chart - plan: + tag_commit: "true" - get: stratos passed: [build-images] trigger: true diff --git a/deploy/ci/console-nightly-releases.yml b/deploy/ci/console-nightly-releases.yml index 8843c2e278..705524296f 100644 --- a/deploy/ci/console-nightly-releases.yml +++ b/deploy/ci/console-nightly-releases.yml @@ -106,7 +106,6 @@ jobs: build: stratos/ target_name: prod-build tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag - tag_commit: true build_args_file: image-tag/build-args - put: postflight-image params: @@ -114,20 +113,17 @@ jobs: build: stratos/ target_name: postflight-job tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag - tag_commit: true - put: mariadb-image params: dockerfile: stratos/deploy/db/Dockerfile.mariadb build: stratos/deploy/db tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag - tag_commit: true - put: ui-image params: dockerfile: stratos/deploy/Dockerfile.ui build: stratos/ target_name: prod-build tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag - tag_commit: true prebuild_script: build/store-git-metadata.sh - name: create-chart plan: From abcda3886fccf372182bd97bf7a7d3e7c783f982 Mon Sep 17 00:00:00 2001 From: Irfan Habib Date: Mon, 20 Aug 2018 12:35:58 +0100 Subject: [PATCH 2/2] Undo inadvertant changes --- deploy/ci/console-dev-releases.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml index b1dc17237c..f2dc3bf42c 100644 --- a/deploy/ci/console-dev-releases.yml +++ b/deploy/ci/console-dev-releases.yml @@ -110,12 +110,16 @@ jobs: patch_base_reg: ((patch-base-reg)) patch_base_tag: ((patch-base-tag)) tag_commit: "true" + - put: mariadb-image + params: dockerfile: stratos/deploy/db/Dockerfile.mariadb build: stratos/deploy/db tag: image-tag/v2-alpha-tag patch_base_reg: ((patch-base-reg)) patch_base_tag: ((patch-base-tag)) tag_commit: "true" + - put: ui-image + params: dockerfile: stratos/deploy/Dockerfile.ui build: stratos/ target_name: prod-build @@ -123,6 +127,8 @@ jobs: patch_base_reg: ((patch-base-reg)) patch_base_tag: ((patch-base-tag)) tag_commit: "true" +- name: create-chart + plan: - get: stratos passed: [build-images] trigger: true