From 4ec7d26fe5c56ca1f51b3a7650a7daa5d42a4f26 Mon Sep 17 00:00:00 2001
From: Okan Kocabalkanli <okanko@amazon.com>
Date: Thu, 7 Nov 2024 14:55:20 -0500
Subject: [PATCH] resolved deadlock

---
 .github/workflows/e2e-build.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e-build.yml b/.github/workflows/e2e-build.yml
index 2932fefd12..856381f89d 100644
--- a/.github/workflows/e2e-build.yml
+++ b/.github/workflows/e2e-build.yml
@@ -4,9 +4,9 @@
 name: Build End-to-End Test Artifacts
 env:
     OPERATOR_GITHUB_REPO_NAME: "aws/amazon-cloudwatch-agent-operator"
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}
-  cancel-in-progress: true
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref_name }}
+#   cancel-in-progress: true
 on:
     push:
         branches:
@@ -50,17 +50,21 @@ jobs:
                     latest_sha=$(git rev-parse HEAD)
                     echo "::set-output name=LATEST_SHA::$latest_sha"
     BuildAgent:
+        needs: [GetLatestCommitSHAs]
         uses: ./.github/workflows/build-test-artifacts.yml
-        secrets: inherit
         concurrency:
-            group: ${{ github.workflow }}-${{inputs.agent-branch}}
+            group: "Build-Test-Artifacts-${{ inputs.agent-branch}}"
             cancel-in-progress: true
+        secrets: inherit
         permissions:
           id-token: write
           contents: read
     BuildOperator:
         needs: [GetLatestCommitSHAs]
         uses: aws/amazon-cloudwatch-agent-operator/.github/workflows/build-and-upload-release.yml@main
+        concurrency:
+            group: ${{ github.workflow }}-operator-${{ inputs.operator-branch}}
+            cancel-in-progress: true
         secrets: inherit
         with:
             tag: ${{needs.GetLatestCommitSHAs.outputs.LATEST_SHA}}