@@ -92,23 +92,26 @@ String s3TemporaryBasePath = System.getenv("amazon_s3_base_path_temporary")
92
92
// If all these variables are missing then we are testing against the internal fixture instead, which has the following
93
93
// credentials hard-coded in.
94
94
95
- if (! s3PermanentAccessKey && ! s3PermanentSecretKey && ! s3PermanentBucket && ! s3PermanentBasePath
96
- && ! s3TemporaryAccessKey && ! s3TemporarySecretKey && ! s3TemporaryBucket && ! s3TemporaryBasePath && ! s3TemporarySessionToken) {
97
-
95
+ if (! s3PermanentAccessKey && ! s3PermanentSecretKey && ! s3PermanentBucket && ! s3PermanentBasePath) {
98
96
s3PermanentAccessKey = ' s3_integration_test_permanent_access_key'
99
97
s3PermanentSecretKey = ' s3_integration_test_permanent_secret_key'
100
98
s3PermanentBucket = ' permanent-bucket-test'
101
99
s3PermanentBasePath = ' integration_test'
102
100
101
+ useFixture = true
102
+
103
+ } else if (! s3PermanentAccessKey || ! s3PermanentSecretKey || ! s3PermanentBucket || ! s3PermanentBasePath) {
104
+ throw new IllegalArgumentException (" not all options specified to run against external S3 service" )
105
+ }
106
+
107
+ if (! s3TemporaryAccessKey && ! s3TemporarySecretKey && ! s3TemporaryBucket && ! s3TemporaryBasePath && ! s3TemporarySessionToken) {
103
108
s3TemporaryAccessKey = ' s3_integration_test_temporary_access_key'
104
109
s3TemporarySecretKey = ' s3_integration_test_temporary_secret_key'
105
110
s3TemporaryBucket = ' temporary-bucket-test'
106
111
s3TemporaryBasePath = ' integration_test'
107
112
s3TemporarySessionToken = ' s3_integration_test_temporary_session_token'
108
113
109
- useFixture = true
110
- } else if (! s3PermanentAccessKey || ! s3PermanentSecretKey || ! s3PermanentBucket || ! s3PermanentBasePath
111
- || ! s3TemporaryAccessKey || ! s3TemporarySecretKey || ! s3TemporaryBucket || ! s3TemporaryBasePath || ! s3TemporarySessionToken) {
114
+ } else if (! s3TemporaryAccessKey || ! s3TemporarySecretKey || ! s3TemporaryBucket || ! s3TemporaryBasePath || ! s3TemporarySessionToken) {
112
115
throw new IllegalArgumentException (" not all options specified to run against external S3 service" )
113
116
}
114
117
@@ -296,6 +299,13 @@ processTestResources {
296
299
MavenFilteringHack . filter(it, expansions)
297
300
}
298
301
302
+ project. afterEvaluate {
303
+ if (useFixture == false ) {
304
+ // 30_repository_temporary_credentials is not ready for CI yet
305
+ integTestRunner. systemProperty ' tests.rest.blacklist' , ' repository_s3/30_repository_temporary_credentials/*'
306
+ }
307
+ }
308
+
299
309
integTestCluster {
300
310
keystoreSetting ' s3.client.integration_test_permanent.access_key' , s3PermanentAccessKey
301
311
keystoreSetting ' s3.client.integration_test_permanent.secret_key' , s3PermanentSecretKey
0 commit comments