From 9a11f7943e3f0c9c9bbda01058d773d3a3afa1d4 Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Tue, 16 Jan 2024 16:19:35 +0100
Subject: [PATCH 01/12] fix: add commit sha

---
 .github/workflows/preproduction-cd.yml | 2 +-
 .github/workflows/production-cd.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/preproduction-cd.yml b/.github/workflows/preproduction-cd.yml
index c8f000f..f31ff59 100644
--- a/.github/workflows/preproduction-cd.yml
+++ b/.github/workflows/preproduction-cd.yml
@@ -25,6 +25,6 @@ jobs:
         with:
           workflow: preproduction-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "commit": "$GITHUB_SHA"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/main'
diff --git a/.github/workflows/production-cd.yml b/.github/workflows/production-cd.yml
index 3634d39..0930432 100644
--- a/.github/workflows/production-cd.yml
+++ b/.github/workflows/production-cd.yml
@@ -24,6 +24,6 @@ jobs:
         with:
           workflow: production-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "commit": "$GITHUB_SHA"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/main'
\ No newline at end of file

From f1e1ef1140f54eea36d50e2d02eb3885d7c6cee8 Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Tue, 16 Jan 2024 16:20:30 +0100
Subject: [PATCH 02/12] fix: add commit sha

---
 .github/workflows/integration-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index 859c4c1..d5a3c5f 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -33,6 +33,6 @@ jobs:
         with:
           workflow: integration-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "commit": "$GITHUB_SHA"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/main'
\ No newline at end of file

From 936703006830d6ec8b073e809711069e6f04acf0 Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Tue, 16 Jan 2024 16:27:41 +0100
Subject: [PATCH 03/12] fix: testing

---
 .github/workflows/integration-cd.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index d5a3c5f..deb790a 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -35,4 +35,5 @@ jobs:
           repo: PrestaShopCorp/qanightlyresults-cd
           inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "commit": "$GITHUB_SHA"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
-          ref: 'refs/heads/main'
\ No newline at end of file
+          # ref: 'refs/heads/main'
+          ref: 'refs/heads/fix/ci-deployment'
\ No newline at end of file

From fbef35b2ea08289ced3508e898adf6cd93de13ee Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Tue, 16 Jan 2024 16:30:26 +0100
Subject: [PATCH 04/12] fix: testing

---
 .github/workflows/integration-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index deb790a..4b99c01 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           workflow: integration-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "commit": "$GITHUB_SHA"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           # ref: 'refs/heads/main'
           ref: 'refs/heads/fix/ci-deployment'
\ No newline at end of file

From 5f7573f02049b7cb58bd2adbfa97eec09690ade5 Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Tue, 16 Jan 2024 16:54:08 +0100
Subject: [PATCH 05/12] fix: testing

---
 .github/workflows/integration-cd.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index 4b99c01..782c7dd 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -28,12 +28,17 @@ jobs:
         id: branch
         uses: tj-actions/branch-names@v7.0.7
 
+      - name: Get tag
+        shell: bash
+        id: get_tag
+        run: echo TAG=$PREFIX_TAG$(echo $GITHUB_REF | cut -d / -f 3) >> $GITHUB_OUTPUT
+
       - name: Trigger CI / CD
         uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: integration-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "commit": "${{ github.sha }}"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           # ref: 'refs/heads/main'
           ref: 'refs/heads/fix/ci-deployment'
\ No newline at end of file

From 30745f5ff7354df6bbc7aba154e87bb12e8ddf15 Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Tue, 16 Jan 2024 17:08:05 +0100
Subject: [PATCH 06/12] fix: validate tag var

---
 .github/workflows/integration-cd.yml   | 3 +--
 .github/workflows/preproduction-cd.yml | 7 ++++++-
 .github/workflows/production-cd.yml    | 7 ++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index 782c7dd..08dc652 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -40,5 +40,4 @@ jobs:
           repo: PrestaShopCorp/qanightlyresults-cd
           inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
-          # ref: 'refs/heads/main'
-          ref: 'refs/heads/fix/ci-deployment'
\ No newline at end of file
+          ref: 'refs/heads/main'
\ No newline at end of file
diff --git a/.github/workflows/preproduction-cd.yml b/.github/workflows/preproduction-cd.yml
index f31ff59..7a6abaa 100644
--- a/.github/workflows/preproduction-cd.yml
+++ b/.github/workflows/preproduction-cd.yml
@@ -20,11 +20,16 @@ jobs:
         id: branch
         uses: tj-actions/branch-names@v7.0.7
 
+      - name: Get tag
+        shell: bash
+        id: get_tag
+        run: echo TAG=$PREFIX_TAG$(echo $GITHUB_REF | cut -d / -f 3) >> $GITHUB_OUTPUT
+
       - name: Trigger CI / CD
         uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: preproduction-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "commit": "$GITHUB_SHA"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/main'
diff --git a/.github/workflows/production-cd.yml b/.github/workflows/production-cd.yml
index 0930432..9dd41bb 100644
--- a/.github/workflows/production-cd.yml
+++ b/.github/workflows/production-cd.yml
@@ -19,11 +19,16 @@ jobs:
         id: branch
         uses: tj-actions/branch-names@v7.0.7
 
+      - name: Get tag
+        shell: bash
+        id: get_tag
+        run: echo TAG=$PREFIX_TAG$(echo $GITHUB_REF | cut -d / -f 3) >> $GITHUB_OUTPUT
+
       - name: Trigger CI / CD
         uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: production-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "commit": "$GITHUB_SHA"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/main'
\ No newline at end of file

From adb4a94a22904cb57f6fec8abef572c4b647a416 Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Tue, 16 Jan 2024 17:12:51 +0100
Subject: [PATCH 07/12] fix: validate tag var

---
 .github/workflows/integration-cd.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index 08dc652..ac1b7e3 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -40,4 +40,5 @@ jobs:
           repo: PrestaShopCorp/qanightlyresults-cd
           inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
-          ref: 'refs/heads/main'
\ No newline at end of file
+          ref: 'refs/heads/fix/ci-deployment'
+          # ref: 'refs/heads/main'

From bd7b323a422c1b28c6fa4c17b26a666907aee60e Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Tue, 16 Jan 2024 17:33:00 +0100
Subject: [PATCH 08/12] fix: validate tag var

---
 .github/workflows/integration-cd.yml   | 2 +-
 .github/workflows/preproduction-cd.yml | 2 +-
 .github/workflows/production-cd.yml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index ac1b7e3..8a34107 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           workflow: integration-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/fix/ci-deployment'
           # ref: 'refs/heads/main'
diff --git a/.github/workflows/preproduction-cd.yml b/.github/workflows/preproduction-cd.yml
index 7a6abaa..e78c16a 100644
--- a/.github/workflows/preproduction-cd.yml
+++ b/.github/workflows/preproduction-cd.yml
@@ -30,6 +30,6 @@ jobs:
         with:
           workflow: preproduction-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/main'
diff --git a/.github/workflows/production-cd.yml b/.github/workflows/production-cd.yml
index 9dd41bb..4e7ac1f 100644
--- a/.github/workflows/production-cd.yml
+++ b/.github/workflows/production-cd.yml
@@ -29,6 +29,6 @@ jobs:
         with:
           workflow: production-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/main'
\ No newline at end of file

From 8ead69536442d437ad7ca23cc12f0322a24b1970 Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Tue, 16 Jan 2024 17:34:12 +0100
Subject: [PATCH 09/12] fix: remive testing

---
 .github/workflows/integration-cd.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index 8a34107..24955a5 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -40,5 +40,4 @@ jobs:
           repo: PrestaShopCorp/qanightlyresults-cd
           inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
-          ref: 'refs/heads/fix/ci-deployment'
-          # ref: 'refs/heads/main'
+          ref: 'refs/heads/main'

From d263e115b98ee2581b8350ca8eaa35c3ae6a881b Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Wed, 17 Jan 2024 09:20:25 +0100
Subject: [PATCH 10/12] fix: testing

---
 .github/workflows/integration-cd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index 24955a5..dba4e49 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -1,4 +1,4 @@
-name: Integration CD for QAnightly
+name: Integration CD for nightly board
 
 on:
   pull_request:
@@ -40,4 +40,4 @@ jobs:
           repo: PrestaShopCorp/qanightlyresults-cd
           inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
-          ref: 'refs/heads/main'
+          ref: 'refs/heads/fix/ci-deployment'

From 68f00d6daba4aea88ecfe80de19894a5110fbdc7 Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Wed, 17 Jan 2024 09:46:00 +0100
Subject: [PATCH 11/12] fix: testing

---
 .github/workflows/integration-cd.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index dba4e49..12ed82a 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -41,3 +41,4 @@ jobs:
           inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/fix/ci-deployment'
+

From 73daf3b307c10463352c03b26ef05e68c6055427 Mon Sep 17 00:00:00 2001
From: Elodie Billiot <elodie.billiot@prestashop.com>
Date: Wed, 17 Jan 2024 09:53:50 +0100
Subject: [PATCH 12/12] fix: testing

---
 .github/workflows/integration-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
index 12ed82a..8799450 100644
--- a/.github/workflows/integration-cd.yml
+++ b/.github/workflows/integration-cd.yml
@@ -40,5 +40,5 @@ jobs:
           repo: PrestaShopCorp/qanightlyresults-cd
           inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
-          ref: 'refs/heads/fix/ci-deployment'
+          ref: 'refs/heads/main'