From 2bf69b1dfdde16a8a4ca3ad146178c7c0fd5fec2 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Tue, 24 Jul 2018 14:09:41 +0200 Subject: [PATCH] fixes broken build for third-party-tests (#32315) Relates #31918 / Closes infra/issues/6085 (cherry picked from commit 46709f1) --- plugins/repository-s3/build.gradle | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index 181891e20564d..13119913672af 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -114,9 +114,7 @@ if (!s3PermanentAccessKey && !s3PermanentSecretKey && !s3PermanentBucket && !s3P useFixture = true -} else if (!s3PermanentAccessKey || !s3PermanentSecretKey || !s3PermanentBucket || !s3PermanentBasePath - || !s3EC2Bucket || !s3EC2BasePath - || !s3ECSBucket || !s3ECSBasePath) { +} else if (!s3PermanentAccessKey || !s3PermanentSecretKey || !s3PermanentBucket || !s3PermanentBasePath) { throw new IllegalArgumentException("not all options specified to run against external S3 service") } @@ -349,8 +347,13 @@ processTestResources { project.afterEvaluate { if (useFixture == false) { - // 30_repository_temporary_credentials is not ready for CI yet - integTestRunner.systemProperty 'tests.rest.blacklist', 'repository_s3/30_repository_temporary_credentials/*' + // temporary_credentials, ec2_credentials and ecs_credentials are not ready for third-party-tests yet + integTestRunner.systemProperty 'tests.rest.blacklist', + [ + 'repository_s3/30_repository_temporary_credentials/*', + 'repository_s3/40_repository_ec2_credentials/*', + 'repository_s3/50_repository_ecs_credentials/*' + ].join(",") } }