Refactor

Author: harrryr

.github/workflows/application-signals-e2e-test.yml

@@ -43,49 +43,49 @@ jobs:
   # DEFAULT SETTING: {Java Version}, EC2, AMD64, AL2
   #
 
-  ec2-default-v8-amd64:
+  default-v8-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-default-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
       caller-workflow-name: 'main-build'
       java-version: '8'
       cpu-architecture: 'x86_64'
 
-  ec2-default-v11-amd64:
+  default-v11-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-default-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
       caller-workflow-name: 'main-build'
       java-version: '11'
       cpu-architecture: 'x86_64'
 
-  ec2-default-v17-amd64:
+  default-v17-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-default-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
       caller-workflow-name: 'main-build'
       java-version: '17'
       cpu-architecture: 'x86_64'
 
-  ec2-default-v21-amd64:
+  default-v21-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-default-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
       caller-workflow-name: 'main-build'
       java-version: '21'
       cpu-architecture: 'x86_64'
 
-  ec2-default-v22-amd64:
+  default-v22-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-default-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -157,9 +157,9 @@ jobs:
   # DEFAULT SETTING: Java 11, {Platform}, AMD64, AL2
   #
 
-  ec2-asg-v11-amd64:
+  asg-v11-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-asg-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -171,17 +171,6 @@ jobs:
   # DEFAULT SETTING: Java 11, {Platform}, AMD64, AL2
   #
 
-  metric-limiter-v11-amd64:
-    needs: [ eks-v22-amd64 ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@main
-    secrets: inherit
-    with:
-      aws-region: us-east-1
-      test-cluster-name: 'e2e-adot-test'
-      adot-image-name: ${{ inputs.adot-image-name }}
-      caller-workflow-name: 'main-build'
-      java-version: '11'
-
   k8s-v11-amd64:
     uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@main
     secrets: inherit
@@ -206,12 +195,28 @@ jobs:
   # DEFAULT SETTING: Java 11, EC2, {CPU Architecture}, AL2
   #
 
-  ec2-default-v11-arm64:
+  default-v11-arm64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-default-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
       caller-workflow-name: 'main-build'
       java-version: '11'
       cpu-architecture: 'arm64'
+
+  #
+  # Other Functional Test Case
+  #
+
+
+  metric-limiter-v11-amd64:
+    needs: [ eks-v22-amd64 ]
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@main
+    secrets: inherit
+    with:
+      aws-region: us-east-1
+      test-cluster-name: 'e2e-adot-test'
+      adot-image-name: ${{ inputs.adot-image-name }}
+      caller-workflow-name: 'main-build'
+      java-version: '11'