From 1479633ea31e36db1aff1cdbe14b51f34713df41 Mon Sep 17 00:00:00 2001 From: Raziel Date: Tue, 26 Jul 2022 13:14:27 +0300 Subject: [PATCH 01/16] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 103c8f4f3..e4933c035 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - name: Report image with: CF_IMAGE: ${{ env.CF_IMAGE }} - CF_HOST: "https://mr-5f04515c6f790a046303eb5a-d0a662e.cf-cd.com" + CF_HOST: "https://mr-62dfaa1ce9d373a06a6fe932-bdaf381.cf-cd.com" CF_API_KEY: ${{ secrets.CF_API_KEY }} CF_CONTAINER_REGISTRY_INTEGRATION: "docker" CF_JIRA_INTEGRATION: "jira" @@ -38,7 +38,7 @@ jobs: - name: Checkout csdp-salesdemo_applications uses: actions/checkout@v3 with: - repository: idan-codefresh/canary-rollout # change to real repo + repository: razielt77/canary-rollout # change to real repo path: . - name: Update application version run: | From 6b1f38dc88b2a373dab56fa80bb224314c2b95d1 Mon Sep 17 00:00:00 2001 From: Raziel Date: Tue, 26 Jul 2022 13:17:02 +0300 Subject: [PATCH 02/16] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4933c035..ba8f86ada 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,11 +14,11 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} + username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build & push the Docker image env: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USER }} run: | export VERSION=$(cat service.yaml) export CF_IMAGE=$DOCKERHUB_USERNAME/${{ github.event.repository.name }}:$VERSION From ab4fbc3a05d57c1f0c90d4ee63d54e45b0496fe5 Mon Sep 17 00:00:00 2001 From: Raziel Date: Tue, 26 Jul 2022 13:20:07 +0300 Subject: [PATCH 03/16] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba8f86ada..ac0703b7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: CF_IMAGE: ${{ env.CF_IMAGE }} CF_HOST: "https://mr-62dfaa1ce9d373a06a6fe932-bdaf381.cf-cd.com" CF_API_KEY: ${{ secrets.CF_API_KEY }} - CF_CONTAINER_REGISTRY_INTEGRATION: "docker" + CF_CONTAINER_REGISTRY_INTEGRATION: "dockerhub" CF_JIRA_INTEGRATION: "jira" CF_GITHUB_TOKEN: ${{ secrets.PAT }} CF_JIRA_MESSAGE: "${{ github.event.head_commit.message }}" From 3790920dba10c9a7f378e6de21d4dd2446a4cbde Mon Sep 17 00:00:00 2001 From: Raziel Date: Tue, 26 Jul 2022 16:35:58 +0300 Subject: [PATCH 04/16] Update service.yaml --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index 24560d9b8..f8c1e5ce5 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -blue +orange From ef294c8b01bbff4935114e04e63af805cf6893a3 Mon Sep 17 00:00:00 2001 From: Raziel Date: Tue, 26 Jul 2022 16:46:58 +0300 Subject: [PATCH 05/16] Update service.yaml --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index f8c1e5ce5..24560d9b8 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -orange +blue From 7772322d560fabea862804a803088ac588686aae Mon Sep 17 00:00:00 2001 From: Raziel Date: Tue, 26 Jul 2022 16:55:07 +0300 Subject: [PATCH 06/16] CR-1234 --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index 24560d9b8..f8c1e5ce5 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -blue +orange From 93b73a198ed0eb3e480d9e61925c12cb3dc3f78d Mon Sep 17 00:00:00 2001 From: Raziel Date: Tue, 26 Jul 2022 20:54:52 +0300 Subject: [PATCH 07/16] CR-1234 --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index f8c1e5ce5..a9d1386a1 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -orange +red From 0ce6ce87e53476166797cb7b0938252a229ca5f1 Mon Sep 17 00:00:00 2001 From: Raziel Date: Tue, 26 Jul 2022 20:59:33 +0300 Subject: [PATCH 08/16] CR-1235 --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index a9d1386a1..a5b73ed2e 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -red +green From 4b447d70bdf840d8eafcea8e14f277bd5362da19 Mon Sep 17 00:00:00 2001 From: Raziel Date: Tue, 26 Jul 2022 21:09:04 +0300 Subject: [PATCH 09/16] Update service.yaml --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index a5b73ed2e..08ec89e7f 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -green +purple From c1e3657c66136713e2a20d441a156d911ccaf457 Mon Sep 17 00:00:00 2001 From: Raziel Date: Wed, 27 Jul 2022 12:06:20 +0300 Subject: [PATCH 10/16] CR-1234 --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index 08ec89e7f..24560d9b8 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -purple +blue From ca8c72817560867aecfbf4a764ea0fd48598de7c Mon Sep 17 00:00:00 2001 From: Raziel Date: Wed, 27 Jul 2022 12:15:36 +0300 Subject: [PATCH 11/16] Update service.yaml --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index 24560d9b8..a5b73ed2e 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -blue +green From 1c6231f9d74b479a26e5db11b7e6a09051deba3c Mon Sep 17 00:00:00 2001 From: Raziel Date: Wed, 27 Jul 2022 14:04:01 +0300 Subject: [PATCH 12/16] CR-1234 --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index a5b73ed2e..08ec89e7f 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -green +purple From c6d65e816a0becef74bd7c549a03694cd5482653 Mon Sep 17 00:00:00 2001 From: Raziel Date: Wed, 27 Jul 2022 14:12:49 +0300 Subject: [PATCH 13/16] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac0703b7b..21b467b56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - name: Report image with: CF_IMAGE: ${{ env.CF_IMAGE }} - CF_HOST: "https://mr-62dfaa1ce9d373a06a6fe932-bdaf381.cf-cd.com" + CF_HOST: "https://mr-62e11313baf09e2d31eafdb0-202e3f9.cf-cd.com" CF_API_KEY: ${{ secrets.CF_API_KEY }} CF_CONTAINER_REGISTRY_INTEGRATION: "dockerhub" CF_JIRA_INTEGRATION: "jira" From 903f91390ecaf79293ef334a51c2376231f182b7 Mon Sep 17 00:00:00 2001 From: Raziel Date: Wed, 27 Jul 2022 15:06:37 +0300 Subject: [PATCH 14/16] CR-1234 --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index 08ec89e7f..f8c1e5ce5 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -purple +orange From 004b9e0c67275b7b2c46e61d8765e38726d753bb Mon Sep 17 00:00:00 2001 From: Ziv Levi Date: Wed, 27 Jul 2022 16:10:17 +0300 Subject: [PATCH 15/16] Update ci.yml --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21b467b56..67eba7c06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,11 @@ name: Github-action-demo on: - push: - branches: [ master ] + pull_request: + branches: + - main + types: + - closed jobs: build: environment: @@ -32,7 +35,8 @@ jobs: CF_CONTAINER_REGISTRY_INTEGRATION: "dockerhub" CF_JIRA_INTEGRATION: "jira" CF_GITHUB_TOKEN: ${{ secrets.PAT }} - CF_JIRA_MESSAGE: "${{ github.event.head_commit.message }}" + CF_JIRA_MESSAGE: "${{ github.event.pull_request.head.ref }}" + CF_GIT_BRANCH: "${{ github.event.pull_request.head.ref }}" CF_JIRA_PROJECT_PREFIX: "CR" uses: codefresh-io/codefresh-report-image@latest - name: Checkout csdp-salesdemo_applications From faf1454866c39871bf0622376b202596a86e09f9 Mon Sep 17 00:00:00 2001 From: Raziel Date: Wed, 27 Jul 2022 16:25:27 +0300 Subject: [PATCH 16/16] Update service.yaml --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index f8c1e5ce5..08ec89e7f 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -orange +purple