Skip to content

Revert "revert PR6512" #6522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+17 −15
Open

Revert "revert PR6512" #6522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33792f6
Improvements to S3 Regression Testing
dagnir Oct 24, 2025
e6713fe
Revert "revert PR6512"
dagnir Oct 27, 2025
fe811d6
Merge commit 'refs/pull/6519/head' of github.com:aws/aws-sdk-java-v2 …
dagnir Oct 27, 2025
033ec63
Merge branch 'master' into dongie/remove-echo
dagnir Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/s3-regression-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: S3 Regression Tests
on:
pull_request:
types: [ opened, synchronize, reopened, labeled, unlabeled ]
merge_group:
push:
branches:
Expand All @@ -14,7 +15,7 @@ jobs:
if: github.repository == 'aws/aws-sdk-java-v2'
runs-on: ubuntu-latest
outputs:
has_s3_related_changes: ${{ steps.check-changes.outputs.has_s3_related_changes }}
run_tests: ${{ contains(github.event.pull_request.labels.*.name, 'force-s3-regression-tests') || steps.check-changes.outputs.has_s3_related_changes }}
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -40,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
env:
REGRESSION_TEST: DownloadStreamingRegressionTesting
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand All @@ -61,7 +62,7 @@ jobs:
runs-on: ubuntu-latest
env:
REGRESSION_TEST: ControlPlaneOperationRegressionTesting
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand All @@ -82,7 +83,7 @@ jobs:
runs-on: ubuntu-latest
env:
REGRESSION_TEST: UploadSyncRegressionTesting
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand All @@ -103,7 +104,7 @@ jobs:
runs-on: ubuntu-latest
env:
REGRESSION_TEST: UploadAsyncRegressionTesting
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand All @@ -124,7 +125,7 @@ jobs:
runs-on: ubuntu-latest
env:
REGRESSION_TEST: UploadCrtRegressionTesting
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand All @@ -145,7 +146,7 @@ jobs:
runs-on: ubuntu-latest
env:
REGRESSION_TEST: UploadTransferManagerRegressionTesting
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
1 change: 0 additions & 1 deletion buildspecs/s3-regression-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ phases:
exit 0
fi
mvn clean install -P s3-regression-tests -pl :s3-tests -am -T1C -Dregression.test="$REGRESSION_TEST" $MAVEN_OPTIONS
echo $MAVEN_OPTIONS
finally:
- mkdir -p codebuild-test-reports
- find ./ -name 'TEST-*.xml' -type f -exec cp {} codebuild-test-reports/ \;
Expand Down
16 changes: 9 additions & 7 deletions ...-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,15 @@ public static List<UploadConfig> testConfigs() {
for (UploadStreamingRegressionTesting.ContentSize cs :
UploadStreamingRegressionTesting.ContentSize.values()) {
for (boolean ps : payloadSign) {
UploadConfig testConfig = new UploadConfig();
testConfig.setRequestChecksumValidation(checksumValidation);
testConfig.setBodyType(bodType);
testConfig.setContentSize(cs);
testConfig.setPayloadSigning(ps);
testConfig.setBucketType(BucketType.STANDARD_BUCKET);
configs.add(testConfig);
for (BucketType bucketType : BucketType.values()) {
UploadConfig testConfig = new UploadConfig();
testConfig.setRequestChecksumValidation(checksumValidation);
testConfig.setBodyType(bodType);
testConfig.setContentSize(cs);
testConfig.setPayloadSigning(ps);
testConfig.setBucketType(bucketType);
configs.add(testConfig);
}
}
}
}
Expand Down
Loading