Test

aws · May 17, 2024 · 5cdeafc · 5cdeafc
1 parent 37aaf02
commit 5cdeafc
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 62 deletions.
diff --git a/.github/workflows/application-signals-e2e-test.yml b/.github/workflows/application-signals-e2e-test.yml
@@ -35,7 +35,7 @@ jobs:
     uses: ./.github/workflows/application-signals-java-e2e-test.yml
     with:
       test-java-cluster-name: ${{ inputs.test-java-cluster-name }}
-      tag: 'staging'
+      tag: ${{ inputs.tag }}
 
   python-e2e-tests:
     # Two E2E tests should not run at the same time in the same EKS cluster
@@ -46,4 +46,4 @@ jobs:
     uses: ./.github/workflows/application-signals-python-e2e-test.yml
     with:
       test-python-cluster-name: ${{ inputs.test-python-cluster-name }}
-      tag: 'staging'
+      tag: ${{ inputs.tag }}
diff --git a/.github/workflows/application-signals-java-e2e-test.yml b/.github/workflows/application-signals-java-e2e-test.yml
@@ -37,7 +37,7 @@ env:
   APPLICATION_SIGNALS_CW_AGENT_IMAGE: 506463145083.dkr.ecr.us-west-2.amazonaws.com/cwagent-integration-test:00ef994d0feaa8ebe03da61cd9fcfcc1f20ca650
 
 jobs:
-  appsignals-e2e-test:
+  appsignals-java-e2e-test:
     runs-on: ubuntu-latest
     steps:
       # This step avoids code duplication for terraform templates and the validator
@@ -191,12 +191,12 @@ jobs:
           echo "NEW_CW_AGENT_OPERATOR_IMAGE"=$(kubectl get pods -n amazon-cloudwatch -l app.kubernetes.io/name=amazon-cloudwatch-observability -o json | \
           jq '.items[0].status.containerStatuses[0].image') >> $GITHUB_ENV
 
-#      - name: Check if CW Agent Operator image has changed
-#        run: |
-#          if [ ${{ env.OLD_CW_AGENT_OPERATOR_IMAGE }} = ${{ env.NEW_CW_AGENT_OPERATOR_IMAGE }} ]; then
-#            echo "Operator image did not change"
-#            exit 1
-#          fi
+      - name: Check if CW Agent Operator image has changed
+        run: |
+          if [ ${{ env.OLD_CW_AGENT_OPERATOR_IMAGE }} = ${{ env.NEW_CW_AGENT_OPERATOR_IMAGE }} ]; then
+            echo "Operator image did not change"
+            exit 1
+          fi
         
       - name: Get the sample app endpoint
         run: |

diff --git a/.github/workflows/application-signals-python-e2e-test.yml b/.github/workflows/application-signals-python-e2e-test.yml
@@ -36,7 +36,7 @@ env:
   APPLICATION_SIGNALS_CW_AGENT_IMAGE: 506463145083.dkr.ecr.us-west-2.amazonaws.com/cwagent-integration-test:00ef994d0feaa8ebe03da61cd9fcfcc1f20ca650
 
 jobs:
-  appsignals-e2e-test:
+  appsignals-python-e2e-test:
     runs-on: ubuntu-latest
     steps:
       - name: Download enablement script
@@ -196,12 +196,12 @@ jobs:
           echo "NEW_CW_AGENT_OPERATOR_IMAGE"=$(kubectl get pods -n amazon-cloudwatch -l app.kubernetes.io/name=amazon-cloudwatch-observability -o json | \
           jq '.items[0].status.containerStatuses[0].image') >> $GITHUB_ENV
 
-#      - name: Check if CW Agent Operator image has changed
-#        run: |
-#          if [ ${{ env.OLD_CW_AGENT_OPERATOR_IMAGE }} = ${{ env.NEW_CW_AGENT_OPERATOR_IMAGE }} ]; then
-#            echo "Operator image did not change"
-#            exit 1
-#          fi
+      - name: Check if CW Agent Operator image has changed
+        run: |
+          if [ ${{ env.OLD_CW_AGENT_OPERATOR_IMAGE }} = ${{ env.NEW_CW_AGENT_OPERATOR_IMAGE }} ]; then
+            echo "Operator image did not change"
+            exit 1
+          fi
 
       - name: Get the sample app endpoint
         run: |

diff --git a/.github/workflows/test-2.yml b/.github/workflows/test-2.yml
@@ -12,54 +12,54 @@ on:
   push:
 
 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 }}:integration-test
-#          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 }}:integration-test
+          platforms: linux/amd64, linux/arm64
 
   e2e-test:
-#    needs: MakeBinary
+    needs: MakeBinary
     uses: ./.github/workflows/application-signals-e2e-test.yml
     secrets: inherit
     with: