Test

harrryr · Oct 2, 2024 · ff9ec5f · ff9ec5f
1 parent df5f376
commit ff9ec5f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 81 deletions.
diff --git a/.github/workflows/java-eks-test.yml b/.github/workflows/java-eks-test.yml
@@ -441,6 +441,9 @@ jobs:
           --query-string ip=${{ env.REMOTE_SERVICE_POD_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
+      - name: test
+        run: sleep 500
+
       - name: Refresh AWS Credentials
         if: ${{ github.event.repository.name == 'aws-application-signals-test-framework' }}
         uses: aws-actions/configure-aws-credentials@v4

diff --git a/.github/workflows/java-sample-app-ecr-deploy.yml b/.github/workflows/java-sample-app-ecr-deploy.yml
@@ -8,6 +8,7 @@
 name: Sample App Deployment - Java ECR
 on:
   workflow_dispatch:
+  push:
 
 permissions:
   id-token: write
@@ -18,83 +19,11 @@ env:
   E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
 
 jobs:
-  java-v11-main:
-    strategy:
-      fail-fast: false
-      matrix:
-        aws-region: [ 'us-east-1' ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
-          aws-region: us-east-1
-
-      - name: Retrieve account
-        uses: aws-actions/aws-secretsmanager-get-secrets@v1
-        with:
-          secret-ids: |
-            ACCOUNT_ID, region-account/${{ matrix.aws-region }}
-            JAVA_MAIN_SAMPLE_APP_IMAGE, e2e-test/java-main-sample-app-image
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
-          aws-region: ${{ matrix.aws-region }}
-
-      - name: Build and Upload Main Service Image
-        working-directory: sample-apps/java/springboot-main-service
-        run: |
-          sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.ACCOUNT_ID }}.dkr.ecr.${{ matrix.aws-region }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
-          gradle jib -P javaVersion=11
-
-  java-v11-remote:
-    strategy:
-      fail-fast: false
-      matrix:
-        aws-region: [ 'us-east-1' ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
-          aws-region: us-east-1
-
-      - name: Retrieve account
-        uses: aws-actions/aws-secretsmanager-get-secrets@v1
-        with:
-          secret-ids: |
-            ACCOUNT_ID, region-account/${{ matrix.aws-region }}
-            JAVA_REMOTE_SAMPLE_APP_IMAGE, e2e-test/java-remote-sample-app-image
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
-          aws-region: ${{ matrix.aws-region }}
-
-      - name: Build and Upload Remote Service Image
-        working-directory: sample-apps/java/springboot-remote-service
-        run: |
-          sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.ACCOUNT_ID }}.dkr.ecr.${{ matrix.aws-region }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
-          gradle jib -P javaVersion=11
-
   java-main:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ '8', '17', '21', '22' ]
+        java-version: [ '8' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -134,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ '8', '17', '21', '22' ]
+        java-version: [ '8' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/python-eks-test.yml b/.github/workflows/python-eks-test.yml
@@ -438,9 +438,6 @@ jobs:
           --query-string ip=${{ env.REMOTE_SERVICE_POD_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
-      - name: test
-        run: sleep 500
-
       - name: Refresh AWS Credentials
         if: ${{ github.event.repository.name == 'aws-application-signals-test-framework' }}
         uses: aws-actions/configure-aws-credentials@v4

diff --git a/.github/workflows/test-2.yml b/.github/workflows/test-2.yml
@@ -7,7 +7,9 @@
 ## including logs, metrics, and traces.
 name: Java EKS Enablement Canary Testing
 on:
-  push:
+#  push:
+  workflow_dispatch:
+
 
 permissions:
   id-token: write

diff --git a/sample-apps/java/springboot-main-service/build.gradle.kts b/sample-apps/java/springboot-main-service/build.gradle.kts
@@ -26,7 +26,6 @@ plugins {
   id("org.springframework.boot")
   id("io.spring.dependency-management") version "1.1.0"
   id("com.google.cloud.tools.jib")
-  id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
 }
 
 group = "com.amazon.sampleapp"
@@ -47,8 +46,6 @@ dependencies {
   implementation("software.amazon.awssdk:sts")
   implementation("com.mysql:mysql-connector-j:8.4.0")
   implementation ("org.apache.httpcomponents:httpclient:4.5.13")
-  implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.20")
-  testImplementation("org.jetbrains.kotlin:kotlin-test:2.0.20")
 }
 
 jib {