Skip to content

Commit 987aec6

Browse files
authored
chore(java): Attempt to reduce flaky CI (#2220)
1 parent 1a3d1f0 commit 987aec6

3 files changed

Lines changed: 13 additions & 46 deletions

File tree

.github/workflows/ci_test_vector_java.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ jobs:
5555
if: matrix.os == 'macos-15-intel' && matrix.library == 'TestVectors'
5656
uses: douglascamata/setup-docker-macos-action@v1.1.0
5757

58+
- name: Pre-pull DynamoDB Local image with retry
59+
if: matrix.library == 'TestVectors'
60+
uses: nick-fields/retry@v3
61+
with:
62+
timeout_minutes: 5
63+
max_attempts: 3
64+
command: docker pull amazon/dynamodb-local:latest
65+
5866
- name: Setup DynamoDB Local
5967
if: matrix.library == 'TestVectors'
6068
uses: rrainn/dynamodb-action@v4.0.0

DynamoDbEncryption/runtimes/java/src/test/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/DynamoDbEncryptionInterceptorIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ public void TestTransactWriteAndGet() {
394394
// Put Item into table via transactions
395395
HashMap<String, AttributeValue> item = new HashMap<>();
396396

397-
String partitionValue = "transact";
397+
String partitionValue = "transact" + randomNum;
398398
String sortValue1 = "1";
399399
String sortValue2 = "2";
400400
String attrValue = "lorem ipsum";

cfn/CI.yaml

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Resources:
6060
- AttributeName: "sort_key"
6161
KeyType: "RANGE"
6262
TableName: !Ref TableName
63+
BillingMode: PAY_PER_REQUEST
6364

6465
# These tables were manually created but not used in CI
6566
# If we have to start using them in CI we just have to add
@@ -102,9 +103,6 @@ Resources:
102103
KeyType: "HASH"
103104
Projection:
104105
ProjectionType: ALL
105-
ProvisionedThroughput:
106-
ReadCapacityUnits: "5"
107-
WriteCapacityUnits: "5"
108106
- IndexName: "state-zip-index"
109107
KeySchema:
110108
- AttributeName: "aws_dbe_b_state"
@@ -113,36 +111,24 @@ Resources:
113111
KeyType: "RANGE"
114112
Projection:
115113
ProjectionType: ALL
116-
ProvisionedThroughput:
117-
ReadCapacityUnits: "5"
118-
WriteCapacityUnits: "5"
119114
- IndexName: "location-index"
120115
KeySchema:
121116
- AttributeName: "aws_dbe_b_location"
122117
KeyType: "HASH"
123118
Projection:
124119
ProjectionType: ALL
125-
ProvisionedThroughput:
126-
ReadCapacityUnits: "5"
127-
WriteCapacityUnits: "5"
128120
- IndexName: "stateAndHasSensitiveData-index"
129121
KeySchema:
130122
- AttributeName: "aws_dbe_b_stateAndHasSensitiveData"
131123
KeyType: "HASH"
132124
Projection:
133125
ProjectionType: ALL
134-
ProvisionedThroughput:
135-
ReadCapacityUnits: "5"
136-
WriteCapacityUnits: "5"
137126
- IndexName: "buildingAndFloor-index"
138127
KeySchema:
139128
- AttributeName: "aws_dbe_b_buildingAndFloor"
140129
KeyType: "HASH"
141130
Projection:
142131
ProjectionType: ALL
143-
ProvisionedThroughput:
144-
ReadCapacityUnits: "5"
145-
WriteCapacityUnits: "5"
146132
- IndexName: "email-birthday-index"
147133
KeySchema:
148134
- AttributeName: "aws_dbe_b_email"
@@ -151,9 +137,6 @@ Resources:
151137
KeyType: "RANGE"
152138
Projection:
153139
ProjectionType: ALL
154-
ProvisionedThroughput:
155-
ReadCapacityUnits: "5"
156-
WriteCapacityUnits: "5"
157140
- IndexName: "address-birthday-index"
158141
KeySchema:
159142
- AttributeName: "aws_dbe_b_address"
@@ -162,17 +145,12 @@ Resources:
162145
KeyType: "RANGE"
163146
Projection:
164147
ProjectionType: ALL
165-
ProvisionedThroughput:
166-
ReadCapacityUnits: "5"
167-
WriteCapacityUnits: "5"
168148
KeySchema:
169149
- AttributeName: "customer_id"
170150
KeyType: "HASH"
171151
- AttributeName: "create_time"
172152
KeyType: "RANGE"
173-
ProvisionedThroughput:
174-
ReadCapacityUnits: "5"
175-
WriteCapacityUnits: "5"
153+
BillingMode: PAY_PER_REQUEST
176154
TableName: !Ref TableWithSimpleBeaconIndexName
177155

178156
# This schema is modeled off of
@@ -207,9 +185,6 @@ Resources:
207185
KeyType: "RANGE"
208186
Projection:
209187
ProjectionType: ALL
210-
ProvisionedThroughput:
211-
ReadCapacityUnits: "5"
212-
WriteCapacityUnits: "5"
213188
- IndexName: "GSI-1"
214189
KeySchema:
215190
- AttributeName: "aws_dbe_b_PK1"
@@ -218,18 +193,12 @@ Resources:
218193
KeyType: "RANGE"
219194
Projection:
220195
ProjectionType: ALL
221-
ProvisionedThroughput:
222-
ReadCapacityUnits: "5"
223-
WriteCapacityUnits: "5"
224196
- IndexName: "GSI-2"
225197
KeySchema:
226198
- AttributeName: "aws_dbe_b_PK2"
227199
KeyType: "HASH"
228200
Projection:
229201
ProjectionType: ALL
230-
ProvisionedThroughput:
231-
ReadCapacityUnits: "5"
232-
WriteCapacityUnits: "5"
233202
- IndexName: "GSI-3"
234203
KeySchema:
235204
- AttributeName: "aws_dbe_b_PK3"
@@ -238,15 +207,10 @@ Resources:
238207
KeyType: "RANGE"
239208
Projection:
240209
ProjectionType: ALL
241-
ProvisionedThroughput:
242-
ReadCapacityUnits: "5"
243-
WriteCapacityUnits: "5"
244210
KeySchema:
245211
- AttributeName: "partition_key"
246212
KeyType: "HASH"
247-
ProvisionedThroughput:
248-
ReadCapacityUnits: "5"
249-
WriteCapacityUnits: "5"
213+
BillingMode: PAY_PER_REQUEST
250214
TableName: !Ref TableWithComplexBeaconIndexName
251215

252216
TestKeystoreTable:
@@ -268,17 +232,12 @@ Resources:
268232
KeyType: "RANGE"
269233
Projection:
270234
ProjectionType: ALL
271-
ProvisionedThroughput:
272-
ReadCapacityUnits: "5"
273-
WriteCapacityUnits: "5"
274235
KeySchema:
275236
- AttributeName: "branch-key-id"
276237
KeyType: "HASH"
277238
- AttributeName: "type"
278239
KeyType: "RANGE"
279-
ProvisionedThroughput:
280-
ReadCapacityUnits: "5"
281-
WriteCapacityUnits: "5"
240+
BillingMode: PAY_PER_REQUEST
282241
TableName: !Ref KeystoreTableName
283242

284243
# This policy SHOULD be given to:

0 commit comments

Comments
 (0)