From 270593acd54a29281b18ed527ce26236bdc9ef97 Mon Sep 17 00:00:00 2001
From: harryryu <harryryu@amazon.com>
Date: Wed, 10 Jul 2024 00:39:05 -0700
Subject: [PATCH] Test

---
 .../application-signals-e2e-test.yml          | 68 +++++++------
 .github/workflows/test-2.yml                  | 95 ++++++++++---------
 2 files changed, 87 insertions(+), 76 deletions(-)

diff --git a/.github/workflows/application-signals-e2e-test.yml b/.github/workflows/application-signals-e2e-test.yml
index eac6994f..ed809b8d 100644
--- a/.github/workflows/application-signals-e2e-test.yml
+++ b/.github/workflows/application-signals-e2e-test.yml
@@ -7,6 +7,9 @@
 name: E2E Testing
 on:
   workflow_call:
+    tag:
+      required: true
+      type: string
 
 permissions:
   id-token: write
@@ -18,29 +21,32 @@ concurrency:
 
 
 jobs:
-#  java-eks-e2e-test:
-#    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-e2e-test.yml@consolidate-release-cw-operator
-#    secrets: inherit
-#    with:
-#      aws-region: us-east-1
-#      test-cluster-name: 'e2e-cw-agent-operator-test'
-#      caller-workflow-name: 'main-build'
-#
-#  java-metric-limiter-e2e-test:
-#    needs: [ java-eks-e2e-test ]
-#    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-e2e-test.yml@consolidate-release-cw-operator
-#    secrets: inherit
-#    with:
-#      aws-region: us-east-1
-#      test-cluster-name: 'e2e-cw-agent-operator-test'
-#      caller-workflow-name: 'main-build'
-
-#  java-k8s-e2e-test:
-#    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-e2e-test.yml@consolidate-release-cw-operator
-#    secrets: inherit
-#    with:
-#      aws-region: us-east-1
-#      caller-workflow-name: 'main-build'
+  java-eks-e2e-test:
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-e2e-test.yml@consolidate-release-cw-operator
+    secrets: inherit
+    with:
+      aws-region: us-east-1
+      test-cluster-name: 'e2e-cw-agent-operator-test'
+      caller-workflow-name: 'main-build'
+      cw-agent-operator-tag: ${{ inputs.tag }}
+
+  java-metric-limiter-e2e-test:
+    needs: [ java-eks-e2e-test ]
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-e2e-test.yml@consolidate-release-cw-operator
+    secrets: inherit
+    with:
+      aws-region: us-east-1
+      test-cluster-name: 'e2e-cw-agent-operator-test'
+      caller-workflow-name: 'main-build'
+      cw-agent-operator-tag: ${{ inputs.tag }}
+
+  java-k8s-e2e-test:
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-e2e-test.yml@consolidate-release-cw-operator
+    secrets: inherit
+    with:
+      aws-region: us-east-1
+      caller-workflow-name: 'main-build'
+      cw-agent-operator-tag: ${{ inputs.tag }}
 
   python-eks-e2e-test:
     uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-e2e-test.yml@consolidate-release-cw-operator
@@ -49,11 +55,13 @@ jobs:
       aws-region: us-east-1
       test-cluster-name: 'e2e-cw-agent-operator-python-test'
       caller-workflow-name: 'main-build'
+      cw-agent-operator-tag: ${{ inputs.tag }}
 
-#  python-k8s-e2e-test:
-#    needs: [ java-k8s-e2e-test ]
-#    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-k8s-e2e-test.yml@consolidate-release-cw-operator
-#    secrets: inherit
-#    with:
-#      aws-region: us-east-1
-#      caller-workflow-name: 'main-build'
\ No newline at end of file
+  python-k8s-e2e-test:
+    needs: [ java-k8s-e2e-test ]
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-k8s-e2e-test.yml@consolidate-release-cw-operator
+    secrets: inherit
+    with:
+      aws-region: us-east-1
+      caller-workflow-name: 'main-build'
+      cw-agent-operator-tag: ${{ inputs.tag }}
diff --git a/.github/workflows/test-2.yml b/.github/workflows/test-2.yml
index 9793fe2e..69d4f844 100644
--- a/.github/workflows/test-2.yml
+++ b/.github/workflows/test-2.yml
@@ -12,57 +12,60 @@ env:
   ECR_OPERATOR_RELEASE_IMAGE: ${{ secrets.ECR_OPERATOR_RELEASE_IMAGE }}
 
 jobs:
-#  MakeBinary:
-#    name: 'MakeContainerImage'
-#    runs-on: ubuntu-latest
-#    permissions:
-#      id-token: write
-#      contents: read
-#    steps:
-#      - uses: actions/checkout@v3
-#        with:
-#          fetch-depth: 0
-#
-#      - name: Set up Go 1.x
-#        uses: actions/setup-go@v4
-#        with:
-#          go-version: ~1.19.6
-#          cache: false
-#
-#      - name: Configure AWS Credentials
-#        uses: aws-actions/configure-aws-credentials@v2
-#        with:
-#          role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
-#          aws-region: us-west-2
-#
-#      - name: Login to ECR
-#        if: steps.cached_binaries.outputs.cache-hit == false
-#        id: login-ecr
-#        uses: aws-actions/amazon-ecr-login@v1
-#
-#      - name: Set up Docker Buildx
-#        if: steps.cached_binaries.outputs.cache-hit == false
-#        uses: docker/setup-buildx-action@v1
-#
-#      - name: Set up QEMU
-#        if: steps.cached_binaries.outputs.cache-hit == false
-#        uses: docker/setup-qemu-action@v1
-#
-#      - name: Build Cloudwatch Agent Operator Image and push to ECR
-#        uses: docker/build-push-action@v4
-#        if: steps.cached_binaries.outputs.cache-hit == false
-#        with:
-#          file: ./Dockerfile
-#          context: .
-#          push: true
-#          tags: ${{ env.ECR_OPERATOR_STAGING_REPO }}:staging
-#          platforms: linux/amd64, linux/arm64
+  MakeBinary:
+    name: 'MakeContainerImage'
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v4
+        with:
+          go-version: ~1.19.6
+          cache: false
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
+          aws-region: us-west-2
+
+      - name: Login to ECR
+        if: steps.cached_binaries.outputs.cache-hit == false
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Set up Docker Buildx
+        if: steps.cached_binaries.outputs.cache-hit == false
+        uses: docker/setup-buildx-action@v1
+
+      - name: Set up QEMU
+        if: steps.cached_binaries.outputs.cache-hit == false
+        uses: docker/setup-qemu-action@v1
+
+      - name: Build Cloudwatch Agent Operator Image and push to ECR
+        uses: docker/build-push-action@v4
+        if: steps.cached_binaries.outputs.cache-hit == false
+        with:
+          file: ./Dockerfile
+          context: .
+          push: true
+          tags: ${{ env.ECR_OPERATOR_STAGING_REPO }}:staging
+          platforms: linux/amd64, linux/arm64
 
   ApplicationSignalsEndToEndTest:
     name: "Application Signals E2E Test"
-#    needs: MakeBinary
+    needs: MakeBinary
     uses: ./.github/workflows/application-signals-e2e-test.yml
     secrets: inherit
     permissions:
       id-token: write
       contents: read
+    with:
+      tag: staging
+