@@ -117,7 +117,7 @@ if (!s3PermanentAccessKey && !s3PermanentSecretKey && !s3PermanentBucket && !s3P
117117 useFixture = true
118118
119119} else if (! s3PermanentAccessKey || ! s3PermanentSecretKey || ! s3PermanentBucket || ! s3PermanentBasePath) {
120- throw new IllegalArgumentException (" not all options specified to run against external S3 service" )
120+ throw new IllegalArgumentException (" not all options specified to run against external S3 service as permanent credentials are present " )
121121}
122122
123123if (! s3TemporaryAccessKey && ! s3TemporarySecretKey && ! s3TemporaryBucket && ! s3TemporaryBasePath && ! s3TemporarySessionToken) {
@@ -128,7 +128,7 @@ if (!s3TemporaryAccessKey && !s3TemporarySecretKey && !s3TemporaryBucket && !s3T
128128 s3TemporarySessionToken = ' s3_integration_test_temporary_session_token'
129129
130130} else if (! s3TemporaryAccessKey || ! s3TemporarySecretKey || ! s3TemporaryBucket || ! s3TemporaryBasePath || ! s3TemporarySessionToken) {
131- throw new IllegalArgumentException (" not all options specified to run against external S3 service" )
131+ throw new IllegalArgumentException (" not all options specified to run against external S3 service as temporary credentials are present " )
132132}
133133
134134final String minioVersion = ' RELEASE.2018-06-22T23-48-46Z'
@@ -404,31 +404,31 @@ integTestCluster {
404404
405405integTestRunner. systemProperty ' tests.rest.blacklist' , ' repository_s3/50_repository_ecs_credentials/*'
406406
407- // /
408- RestIntegTestTask integTestECS = project. tasks. create(' integTestECS' , RestIntegTestTask . class) {
409- description = " Runs tests using the ECS repository."
410- }
407+ if (useFixture) {
408+ RestIntegTestTask integTestECS = project. tasks. create(' integTestECS' , RestIntegTestTask . class) {
409+ description = " Runs tests using the ECS repository."
410+ }
411411
412412// The following closure must execute before the afterEvaluate block in the constructor of the following integrationTest tasks:
413- project. afterEvaluate {
414- ClusterConfiguration cluster = project. extensions. getByName(' integTestECSCluster' ) as ClusterConfiguration
415- cluster. dependsOn(project. s3Fixture)
416-
417- cluster. setting ' s3.client.integration_test_ecs.endpoint' , " http://${ -> s3Fixture.addressAndPort} "
418-
419- Task integTestECSTask = project. tasks. getByName(' integTestECS' )
420- integTestECSTask. clusterConfig. plugin(project. path)
421- integTestECSTask. clusterConfig. environment ' AWS_CONTAINER_CREDENTIALS_FULL_URI' ,
422- " http://${ -> s3Fixture.addressAndPort} /ecs_credentials_endpoint"
423- integTestECSRunner. systemProperty ' tests.rest.blacklist' , [
424- ' repository_s3/10_basic/*' ,
425- ' repository_s3/20_repository_permanent_credentials/*' ,
426- ' repository_s3/30_repository_temporary_credentials/*' ,
427- ' repository_s3/40_repository_ec2_credentials/*'
428- ]. join(" ," )
413+ project. afterEvaluate {
414+ ClusterConfiguration cluster = project. extensions. getByName(' integTestECSCluster' ) as ClusterConfiguration
415+ cluster. dependsOn(project. s3Fixture)
416+
417+ cluster. setting ' s3.client.integration_test_ecs.endpoint' , " http://${ -> s3Fixture.addressAndPort} "
418+
419+ Task integTestECSTask = project. tasks. getByName(' integTestECS' )
420+ integTestECSTask. clusterConfig. plugin(project. path)
421+ integTestECSTask. clusterConfig. environment ' AWS_CONTAINER_CREDENTIALS_FULL_URI' ,
422+ " http://${ -> s3Fixture.addressAndPort} /ecs_credentials_endpoint"
423+ integTestECSRunner. systemProperty ' tests.rest.blacklist' , [
424+ ' repository_s3/10_basic/*' ,
425+ ' repository_s3/20_repository_permanent_credentials/*' ,
426+ ' repository_s3/30_repository_temporary_credentials/*' ,
427+ ' repository_s3/40_repository_ec2_credentials/*'
428+ ]. join(" ," )
429+ }
430+ project. check. dependsOn(integTestECS)
429431}
430- project. check. dependsOn(integTestECS)
431- // /
432432
433433thirdPartyAudit. excludes = [
434434 // classes are missing
0 commit comments