Skip to content

Commit 5f72737

Browse files
L-ApplinL-Applin
committed
mark CI job as successful without running tests when detecting non s3 related changes. Remove dummy change for validating/testing CI behaviour.
1 parent b1cf83a commit 5f72737

File tree

2 files changed

+49
-7
lines changed

2 files changed

+49
-7
lines changed

‎.github/workflows/codebuild-ci.yml

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,108 +193,150 @@ jobs:
193193
194194
s3-regression-tests-download:
195195
needs: check-s3-related-changes
196-
if: github.repository == 'aws/aws-sdk-java-v2' && needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
196+
if: github.repository == 'aws/aws-sdk-java-v2'
197197
runs-on: ubuntu-latest
198198
env:
199199
REGRESSION_TEST: DownloadStreamingRegressionTesting
200200
steps:
201+
- name: Skip test - no S3 related changes
202+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes != 'true'
203+
run: |
204+
echo "No S3 related changes detected. Skipping S3 regression tests for downloads."
205+
exit 0
201206
- name: Configure AWS Credentials
207+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
202208
uses: aws-actions/configure-aws-credentials@v4
203209
with:
204210
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
205211
aws-region: us-west-2
206212
role-duration-seconds: 7200
207213
- name: Run s3 regression tests for downloads
214+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
208215
uses: aws-actions/aws-codebuild-run-build@v1
209216
with:
210217
project-name: aws-sdk-java-v2-s3-regression-tests
211218
env-vars-for-codebuild: REGRESSION_TEST
212219
s3-regression-tests-control-plane:
213220
needs: check-s3-related-changes
214-
if: github.repository == 'aws/aws-sdk-java-v2' && needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
221+
if: github.repository == 'aws/aws-sdk-java-v2'
215222
runs-on: ubuntu-latest
216223
env:
217224
REGRESSION_TEST: ControlPlaneOperationRegressionTesting
218225
steps:
226+
- name: Skip test - no S3 related changes
227+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes != 'true'
228+
run: |
229+
echo "No S3 related changes detected. Skipping S3 regression tests for control plane."
230+
exit 0
219231
- name: Configure AWS Credentials
232+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
220233
uses: aws-actions/configure-aws-credentials@v4
221234
with:
222235
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
223236
aws-region: us-west-2
224237
role-duration-seconds: 7200
225238
- name: Run s3 regression tests for control plane
239+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
226240
uses: aws-actions/aws-codebuild-run-build@v1
227241
with:
228242
project-name: aws-sdk-java-v2-s3-regression-tests
229243
env-vars-for-codebuild: REGRESSION_TEST
230244
s3-regression-tests-upload-sync:
231245
needs: check-s3-related-changes
232-
if: github.repository == 'aws/aws-sdk-java-v2' && needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
246+
if: github.repository == 'aws/aws-sdk-java-v2'
233247
runs-on: ubuntu-latest
234248
env:
235249
REGRESSION_TEST: UploadSyncRegressionTesting
236250
steps:
251+
- name: Skip test - no S3 related changes
252+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes != 'true'
253+
run: |
254+
echo "No S3 related changes detected. Skipping S3 regression tests for upload sync."
255+
exit 0
237256
- name: Configure AWS Credentials
257+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
238258
uses: aws-actions/configure-aws-credentials@v4
239259
with:
240260
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
241261
aws-region: us-west-2
242262
role-duration-seconds: 7200
243263
- name: Run s3 regression tests for uploads
264+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
244265
uses: aws-actions/aws-codebuild-run-build@v1
245266
with:
246267
project-name: aws-sdk-java-v2-s3-regression-tests
247268
env-vars-for-codebuild: REGRESSION_TEST
248269
s3-regression-tests-upload-async:
249270
needs: check-s3-related-changes
250-
if: github.repository == 'aws/aws-sdk-java-v2' && needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
271+
if: github.repository == 'aws/aws-sdk-java-v2'
251272
runs-on: ubuntu-latest
252273
env:
253274
REGRESSION_TEST: UploadAsyncRegressionTesting
254275
steps:
276+
- name: Skip test - no S3 related changes
277+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes != 'true'
278+
run: |
279+
echo "No S3 related changes detected. Skipping S3 regression tests for upload async."
280+
exit 0
255281
- name: Configure AWS Credentials
282+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
256283
uses: aws-actions/configure-aws-credentials@v4
257284
with:
258285
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
259286
aws-region: us-west-2
260287
role-duration-seconds: 7200
261288
- name: Run s3 regression tests for uploads
289+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
262290
uses: aws-actions/aws-codebuild-run-build@v1
263291
with:
264292
project-name: aws-sdk-java-v2-s3-regression-tests
265293
env-vars-for-codebuild: REGRESSION_TEST
266294
s3-regression-tests-upload-crt:
267295
needs: check-s3-related-changes
268-
if: github.repository == 'aws/aws-sdk-java-v2' && needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
296+
if: github.repository == 'aws/aws-sdk-java-v2'
269297
runs-on: ubuntu-latest
270298
env:
271299
REGRESSION_TEST: UploadCrtRegressionTesting
272300
steps:
301+
- name: Skip test - no S3 related changes
302+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes != 'true'
303+
run: |
304+
echo "No S3 related changes detected. Skipping S3 regression tests for upload CRT."
305+
exit 0
273306
- name: Configure AWS Credentials
307+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
274308
uses: aws-actions/configure-aws-credentials@v4
275309
with:
276310
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
277311
aws-region: us-west-2
278312
role-duration-seconds: 7200
279313
- name: Run s3 regression tests for uploads
314+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
280315
uses: aws-actions/aws-codebuild-run-build@v1
281316
with:
282317
project-name: aws-sdk-java-v2-s3-regression-tests
283318
env-vars-for-codebuild: REGRESSION_TEST
284319
s3-regression-tests-upload-multi:
285320
needs: check-s3-related-changes
286-
if: github.repository == 'aws/aws-sdk-java-v2' && needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
321+
if: github.repository == 'aws/aws-sdk-java-v2'
287322
runs-on: ubuntu-latest
288323
env:
289324
REGRESSION_TEST: UploadTransferManagerRegressionTesting
290325
steps:
326+
- name: Skip test - no S3 related changes
327+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes != 'true'
328+
run: |
329+
echo "No S3 related changes detected. Skipping S3 regression tests for upload transfer manager."
330+
exit 0
291331
- name: Configure AWS Credentials
332+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
292333
uses: aws-actions/configure-aws-credentials@v4
293334
with:
294335
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
295336
aws-region: us-west-2
296337
role-duration-seconds: 7200
297338
- name: Run s3 regression tests for uploads
339+
if: needs.check-s3-related-changes.outputs.has_s3_related_changes == 'true'
298340
uses: aws-actions/aws-codebuild-run-build@v1
299341
with:
300342
project-name: aws-sdk-java-v2-s3-regression-tests

‎services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class MultipartDownloaderSubscriber implements Subscriber<AsyncResponseTr
7575
private volatile String eTag;
7676

7777
/**
78-
* The Subscription lock.
78+
* The Subscription lock
7979
*/
8080
private final Object lock = new Object();
8181

0 commit comments

Comments
 (0)