From 6879eb768a996679b76ad90558d359c9e6fd61f4 Mon Sep 17 00:00:00 2001 From: Harry Date: Wed, 2 Oct 2024 14:16:14 -0700 Subject: [PATCH] Test --- .github/workflows/java-eks-test.yml | 1 + .github/workflows/java-sample-app-ecr-deploy.yml | 1 - .github/workflows/test-2.yml | 5 ++++- .github/workflows/test.yml | 1 + sample-apps/java/springboot-remote-service/build.gradle.kts | 3 --- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/java-eks-test.yml b/.github/workflows/java-eks-test.yml index d3be91e58..6834cf476 100644 --- a/.github/workflows/java-eks-test.yml +++ b/.github/workflows/java-eks-test.yml @@ -442,6 +442,7 @@ jobs: --rollup' - name: test + continue-on-error: true run: sleep 500 - name: Refresh AWS Credentials diff --git a/.github/workflows/java-sample-app-ecr-deploy.yml b/.github/workflows/java-sample-app-ecr-deploy.yml index 83314cdf4..d236e419e 100644 --- a/.github/workflows/java-sample-app-ecr-deploy.yml +++ b/.github/workflows/java-sample-app-ecr-deploy.yml @@ -8,7 +8,6 @@ name: Sample App Deployment - Java ECR on: workflow_dispatch: - push: permissions: id-token: write diff --git a/.github/workflows/test-2.yml b/.github/workflows/test-2.yml index 5fdb0253e..b2dd08ced 100644 --- a/.github/workflows/test-2.yml +++ b/.github/workflows/test-2.yml @@ -7,7 +7,7 @@ ## including logs, metrics, and traces. name: Java EKS Enablement Canary Testing on: -# push: + push: workflow_dispatch: @@ -84,3 +84,6 @@ jobs: test-cluster-name: 'e2e-canary-test' caller-workflow-name: 'appsignals-e2e-eks-canary-test' java-version: '22' + + + diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0567ef29a..814c3127e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,6 +43,7 @@ jobs: caller-workflow-name: 'appsignals-e2e-eks-canary-test' java-version: '11' + eks-17: needs: eks-11 strategy: diff --git a/sample-apps/java/springboot-remote-service/build.gradle.kts b/sample-apps/java/springboot-remote-service/build.gradle.kts index 2339e7699..a5f45619c 100644 --- a/sample-apps/java/springboot-remote-service/build.gradle.kts +++ b/sample-apps/java/springboot-remote-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" @@ -42,8 +41,6 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-logging") 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 {