Skip to content

Commit 2bf69b1

Browse files
fixes broken build for third-party-tests (#32315)
Relates #31918 / Closes infra/issues/6085 (cherry picked from commit 46709f1)
1 parent 127725d commit 2bf69b1

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

plugins/repository-s3/build.gradle

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@ if (!s3PermanentAccessKey && !s3PermanentSecretKey && !s3PermanentBucket && !s3P
114114

115115
useFixture = true
116116

117-
} else if (!s3PermanentAccessKey || !s3PermanentSecretKey || !s3PermanentBucket || !s3PermanentBasePath
118-
|| !s3EC2Bucket || !s3EC2BasePath
119-
|| !s3ECSBucket || !s3ECSBasePath) {
117+
} else if (!s3PermanentAccessKey || !s3PermanentSecretKey || !s3PermanentBucket || !s3PermanentBasePath) {
120118
throw new IllegalArgumentException("not all options specified to run against external S3 service")
121119
}
122120

@@ -349,8 +347,13 @@ processTestResources {
349347

350348
project.afterEvaluate {
351349
if (useFixture == false) {
352-
// 30_repository_temporary_credentials is not ready for CI yet
353-
integTestRunner.systemProperty 'tests.rest.blacklist', 'repository_s3/30_repository_temporary_credentials/*'
350+
// temporary_credentials, ec2_credentials and ecs_credentials are not ready for third-party-tests yet
351+
integTestRunner.systemProperty 'tests.rest.blacklist',
352+
[
353+
'repository_s3/30_repository_temporary_credentials/*',
354+
'repository_s3/40_repository_ec2_credentials/*',
355+
'repository_s3/50_repository_ecs_credentials/*'
356+
].join(",")
354357
}
355358
}
356359

0 commit comments

Comments
 (0)