From e23f75d135100eca12fd2eee0c8c66d2559e84e0 Mon Sep 17 00:00:00 2001 From: Dongie Agnir Date: Mon, 21 Jul 2025 15:09:09 -0700 Subject: [PATCH 1/4] Add Integ tests to CodeBuild CI --- .github/workflows/codebuild-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index fa523f4c0476..6bbdd140e407 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -29,6 +29,22 @@ jobs: timeout-minutes: 120 with: project-name: aws-sdk-java-v2 + integration-tests: + if: github.repository == 'aws/aws-sdk-java-v2' + runs-on: ubuntu-latest + steps: + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} + aws-region: us-west-2 + role-duration-seconds: 7200 + - name: Run Integration Test build + uses: aws-actions/aws-codebuild-run-build@v1 + timeout-minutes: 180 + with: + project-name: aws-sdk-java-v2-IntegrationTest-JDK8 + jdk11-build: if: github.repository == 'aws/aws-sdk-java-v2' runs-on: ubuntu-latest From fc490291a60691b24f4afbd01db6de5a613dc176 Mon Sep 17 00:00:00 2001 From: Dongie Agnir Date: Tue, 22 Jul 2025 11:54:29 -0700 Subject: [PATCH 2/4] Don't stream logs --- .github/workflows/codebuild-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 6bbdd140e407..d8c23c95f840 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -41,6 +41,7 @@ jobs: role-duration-seconds: 7200 - name: Run Integration Test build uses: aws-actions/aws-codebuild-run-build@v1 + hide-cloudwatch-logs: true timeout-minutes: 180 with: project-name: aws-sdk-java-v2-IntegrationTest-JDK8 From aa0af48983a0227df00f6ee18ec93d8c784b4baa Mon Sep 17 00:00:00 2001 From: Dongie Agnir Date: Tue, 22 Jul 2025 12:15:05 -0700 Subject: [PATCH 3/4] Integ tests only on java file changes --- .../codebuild-ci-integration-tests.yml | 31 +++++++++++++++++++ .github/workflows/codebuild-ci.yml | 17 ---------- 2 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/codebuild-ci-integration-tests.yml diff --git a/.github/workflows/codebuild-ci-integration-tests.yml b/.github/workflows/codebuild-ci-integration-tests.yml new file mode 100644 index 000000000000..20c553c1e660 --- /dev/null +++ b/.github/workflows/codebuild-ci-integration-tests.yml @@ -0,0 +1,31 @@ +name: AWS CodeBuild CI Integration Tests +on: + pull_request: + merge_group: + push: + branches: + - master + paths: + - '**/*.java' + +permissions: + id-token: write + +jobs: + integration-tests: + if: github.repository == 'aws/aws-sdk-java-v2' + runs-on: ubuntu-latest + steps: + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} + aws-region: us-west-2 + role-duration-seconds: 7200 + - name: Run Integration Test build + uses: aws-actions/aws-codebuild-run-build@v1 + timeout-minutes: 180 + with: + project-name: aws-sdk-java-v2-IntegrationTest-JDK8 + hide-cloudwatch-logs: true + diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index d8c23c95f840..fa523f4c0476 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -29,23 +29,6 @@ jobs: timeout-minutes: 120 with: project-name: aws-sdk-java-v2 - integration-tests: - if: github.repository == 'aws/aws-sdk-java-v2' - runs-on: ubuntu-latest - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} - aws-region: us-west-2 - role-duration-seconds: 7200 - - name: Run Integration Test build - uses: aws-actions/aws-codebuild-run-build@v1 - hide-cloudwatch-logs: true - timeout-minutes: 180 - with: - project-name: aws-sdk-java-v2-IntegrationTest-JDK8 - jdk11-build: if: github.repository == 'aws/aws-sdk-java-v2' runs-on: ubuntu-latest From 64eed2793751b8affa15bb33ffbc514332aba8bc Mon Sep 17 00:00:00 2001 From: Dongie Agnir Date: Tue, 22 Jul 2025 13:33:32 -0700 Subject: [PATCH 4/4] Move integ to separate workflow --- .github/workflows/codebuild-ci-integration-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codebuild-ci-integration-tests.yml b/.github/workflows/codebuild-ci-integration-tests.yml index 20c553c1e660..a9c66db43fc2 100644 --- a/.github/workflows/codebuild-ci-integration-tests.yml +++ b/.github/workflows/codebuild-ci-integration-tests.yml @@ -1,6 +1,8 @@ name: AWS CodeBuild CI Integration Tests on: pull_request: + paths: + - '**/*.java' merge_group: push: branches: