Skip to content

Commit 7f65df1

Browse files
thewhitewizardthewhitewizard
authored
Upgrade to iexec-commons-poco 3.2.0, iexec-commons-containers 1.2.1 and to iexec-common 8.3.1 (#571)
Upgrade to `iexec-commons-poco` 3.2.0, `iexec-commons-containers` 1.2.1 and to `iexec-common` 8.3.1
1 parent a1e40d1 commit 7f65df1

File tree

6 files changed

+11
-32
lines changed

6 files changed

+11
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ All notable changes to this project will be documented in this file.
2121
- Upgrade to Spring Dependency Management Plugin 1.1.4. (#566)
2222
- Upgrade to `iexec-commons-containers` 1.2.0. (#557)
2323
- Upgrade to `jenkins-library` 2.7.4. (#564)
24+
- Upgrade to `iexec-commons-poco` 3.2.0. (#571)
25+
- Upgrade to `iexec-commons-containers` 1.2.1. (#571)
26+
- Upgrade to `iexec-common` 8.3.1. (#571)
2427

2528
## [[8.2.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.2.0) 2023-09-29
2629

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version=8.2.0
2-
iexecCommonVersion=8.3.0
3-
iexecCommonsContainersVersion=1.2.0
4-
iexecCommonsPocoVersion=3.1.0
2+
iexecCommonVersion=8.3.1
3+
iexecCommonsContainersVersion=1.2.1
4+
iexecCommonsPocoVersion=3.2.0
55
iexecBlockchainAdapterVersion=8.2.0
66
iexecResultVersion=8.2.0
77
iexecSmsVersion=8.3.0

‎src/test/java/com/iexec/worker/compute/ComputeManagerServiceTests.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ private TaskDescription.TaskDescriptionBuilder createTaskDescriptionBuilder(bool
106106
.appType(DappType.DOCKER)
107107
.appUri(APP_URI)
108108
.datasetUri(DATASET_URI)
109-
.teePostComputeImage(TEE_POST_COMPUTE_IMAGE)
110109
.maxExecutionTime(MAX_EXECUTION_TIME)
111110
.inputFiles(Arrays.asList("file0", "file1"))
112111
.isTeeTask(isTeeTask)
@@ -245,7 +244,7 @@ void shouldRunStandardCompute() {
245244
void shouldRunStandardComputeWithFailureResponse() {
246245
final TaskDescription taskDescription = createTaskDescriptionBuilder(false).build();
247246
AppComputeResponse expectedDockerRunResponse =
248-
AppComputeResponse.builder()
247+
AppComputeResponse.builder()
249248
.exitCause(ReplicateStatusCause.APP_COMPUTE_FAILED)
250249
.stdout(dockerLogs.getStdout())
251250
.stderr(dockerLogs.getStderr())
@@ -425,9 +424,9 @@ static Stream<Arguments> computeImagePullTimeoutValues() {
425424
// maxExecutionTime, minPullTimeout, maxPullTimeout, expectedTimeout
426425

427426
// Default values
428-
Arguments.of(3000 , Duration.of(5, ChronoUnit.MINUTES), Duration.of(30, ChronoUnit.MINUTES), 7), // XS category
429-
Arguments.of(12000 , Duration.of(5, ChronoUnit.MINUTES), Duration.of(30, ChronoUnit.MINUTES), 13), // S category
430-
Arguments.of(36000 , Duration.of(5, ChronoUnit.MINUTES), Duration.of(30, ChronoUnit.MINUTES), 18), // M category
427+
Arguments.of(3000, Duration.of(5, ChronoUnit.MINUTES), Duration.of(30, ChronoUnit.MINUTES), 7), // XS category
428+
Arguments.of(12000, Duration.of(5, ChronoUnit.MINUTES), Duration.of(30, ChronoUnit.MINUTES), 13), // S category
429+
Arguments.of(36000, Duration.of(5, ChronoUnit.MINUTES), Duration.of(30, ChronoUnit.MINUTES), 18), // M category
431430
Arguments.of(108000, Duration.of(5, ChronoUnit.MINUTES), Duration.of(30, ChronoUnit.MINUTES), 23), // L category
432431
Arguments.of(360000, Duration.of(5, ChronoUnit.MINUTES), Duration.of(30, ChronoUnit.MINUTES), 28), // XL category
433432

‎src/test/java/com/iexec/worker/compute/app/AppComputeServiceTests.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ class AppComputeServiceTests {
5757
private final static String DATASET_URI = "DATASET_URI";
5858
private final static String APP_URI = "APP_URI";
5959
private final static String WORKER_NAME = "WORKER_NAME";
60-
private final static String TEE_POST_COMPUTE_IMAGE =
61-
"TEE_POST_COMPUTE_IMAGE";
6260
private final static TeeSessionGenerationResponse SECURE_SESSION = mock(TeeSessionGenerationResponse.class);
6361
private final static long MAX_EXECUTION_TIME = 1000;
6462
private final static String INPUT = "INPUT";
@@ -69,7 +67,6 @@ class AppComputeServiceTests {
6967
.chainTaskId(CHAIN_TASK_ID)
7068
.appUri(APP_URI)
7169
.datasetUri(DATASET_URI)
72-
.teePostComputeImage(TEE_POST_COMPUTE_IMAGE)
7370
.maxExecutionTime(MAX_EXECUTION_TIME)
7471
.inputFiles(Arrays.asList("file0", "file1"))
7572
.isTeeTask(true);

‎src/test/java/com/iexec/worker/compute/post/PostComputeServiceTests.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ void shouldRunTeePostComputeAndConnectToLasNetwork() {
214214
taskDescription = TaskDescription.builder()
215215
.chainTaskId(CHAIN_TASK_ID)
216216
.datasetUri(DATASET_URI)
217-
.teePostComputeImage(TEE_POST_COMPUTE_IMAGE)
218217
.maxExecutionTime(MAX_EXECUTION_TIME)
219218
.build();
220219
List<String> env = Arrays.asList("var0", "var1");
@@ -274,7 +273,6 @@ void shouldNotRunTeePostComputeSinceDockerImageNotFoundLocally() {
274273
taskDescription = TaskDescription.builder()
275274
.chainTaskId(CHAIN_TASK_ID)
276275
.datasetUri(DATASET_URI)
277-
.teePostComputeImage(TEE_POST_COMPUTE_IMAGE)
278276
.maxExecutionTime(MAX_EXECUTION_TIME)
279277
.build();
280278
when(postComputeProperties.getImage()).thenReturn(TEE_POST_COMPUTE_IMAGE);
@@ -296,7 +294,6 @@ void shouldRunTeePostComputeWithFailDockerResponse(Map.Entry<Integer, ReplicateS
296294
taskDescription = TaskDescription.builder()
297295
.chainTaskId(CHAIN_TASK_ID)
298296
.datasetUri(DATASET_URI)
299-
.teePostComputeImage(TEE_POST_COMPUTE_IMAGE)
300297
.maxExecutionTime(MAX_EXECUTION_TIME)
301298
.build();
302299
List<String> env = Arrays.asList("var0", "var1");
@@ -345,7 +342,6 @@ void shouldNotRunTeePostComputeSinceTimeout() {
345342
taskDescription = TaskDescription.builder()
346343
.chainTaskId(CHAIN_TASK_ID)
347344
.datasetUri(DATASET_URI)
348-
.teePostComputeImage(TEE_POST_COMPUTE_IMAGE)
349345
.maxExecutionTime(MAX_EXECUTION_TIME)
350346
.build();
351347
List<String> env = Arrays.asList("var0", "var1");

‎src/test/java/com/iexec/worker/compute/pre/PreComputeServiceTests.java‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ class PreComputeServiceTests {
7373
.datasetUri(datasetUri)
7474
.datasetName("datasetName")
7575
.datasetChecksum("datasetChecksum")
76-
.teePostComputeImage("teePostComputeImage")
7776
.teeFramework(TeeFramework.SCONE)
7877
.appEnclaveConfiguration(TeeEnclaveConfiguration.builder()
7978
.fingerprint("01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b")
@@ -169,8 +168,6 @@ void shouldRunTeePreComputeAndPrepareInputDataWhenDatasetAndInputFilesArePresent
169168
void shouldRunTeePreComputeAndPrepareInputDataWhenOnlyDatasetIsPresent() throws TeeSessionGenerationException {
170169
final TaskDescription taskDescription = taskDescriptionBuilder.build();
171170

172-
when(dockerClientInstanceMock.pullImage(taskDescription.getTeePostComputeImage()))
173-
.thenReturn(true);
174171
when(smsService.createTeeSession(workerpoolAuthorization)).thenReturn(secureSession);
175172
when(preComputeProperties.getImage()).thenReturn(PRE_COMPUTE_IMAGE);
176173
when(preComputeProperties.getHeapSizeInBytes()).thenReturn(PRE_COMPUTE_HEAP);
@@ -211,8 +208,6 @@ void shouldRunTeePreComputeAndPrepareInputDataWhenOnlyInputFilesArePresent() thr
211208
.inputFiles(List.of("input-file1"))
212209
.build();
213210

214-
when(dockerClientInstanceMock.pullImage(taskDescription.getTeePostComputeImage()))
215-
.thenReturn(true);
216211
when(smsService.createTeeSession(workerpoolAuthorization)).thenReturn(secureSession);
217212
when(preComputeProperties.getImage()).thenReturn(PRE_COMPUTE_IMAGE);
218213
when(preComputeProperties.getHeapSizeInBytes()).thenReturn(PRE_COMPUTE_HEAP);
@@ -274,9 +269,7 @@ void shouldFailToRunTeePreComputeSinceTooHighComputeHeapSize() throws TeeSession
274269
@Test
275270
void shouldFailToRunTeePreComputeSinceCantCreateTeeSession() throws TeeSessionGenerationException {
276271
final TaskDescription taskDescription = taskDescriptionBuilder.build();
277-
when(dockerClientInstanceMock
278-
.pullImage(taskDescription.getTeePostComputeImage()))
279-
.thenReturn(true);
272+
280273
when(smsService.createTeeSession(workerpoolAuthorization)).thenReturn(secureSession);
281274

282275
Assertions.assertThat(preComputeService.runTeePreCompute(taskDescription, workerpoolAuthorization).isSuccessful())
@@ -288,9 +281,6 @@ void shouldFailToRunTeePreComputeSinceCantCreateTeeSession() throws TeeSessionGe
288281
@Test
289282
void shouldNotRunTeePreComputeSinceDockerImageNotFoundLocally() throws TeeSessionGenerationException {
290283
final TaskDescription taskDescription = taskDescriptionBuilder.build();
291-
when(dockerClientInstanceMock
292-
.pullImage(taskDescription.getTeePostComputeImage()))
293-
.thenReturn(true);
294284
when(smsService.createTeeSession(workerpoolAuthorization))
295285
.thenReturn(secureSession);
296286
when(preComputeProperties.getImage()).thenReturn(PRE_COMPUTE_IMAGE);
@@ -309,9 +299,6 @@ void shouldNotRunTeePreComputeSinceDockerImageNotFoundLocally() throws TeeSessio
309299
@MethodSource("shouldFailToRunTeePreComputeSinceDockerRunFailedArgs")
310300
void shouldFailToRunTeePreComputeSinceDockerRunFailed(Map.Entry<Integer, ReplicateStatusCause> exitCodeKeyToExpectedCauseValue) throws TeeSessionGenerationException {
311301
final TaskDescription taskDescription = taskDescriptionBuilder.build();
312-
when(dockerClientInstanceMock
313-
.pullImage(taskDescription.getTeePostComputeImage()))
314-
.thenReturn(true);
315302
when(smsService.createTeeSession(workerpoolAuthorization))
316303
.thenReturn(secureSession);
317304
when(preComputeProperties.getImage()).thenReturn(PRE_COMPUTE_IMAGE);
@@ -351,9 +338,6 @@ private static Stream<Map.Entry<Integer, ReplicateStatusCause>> shouldFailToRunT
351338
@Test
352339
void shouldFailToRunTeePreComputeSinceTimeout() throws TeeSessionGenerationException {
353340
final TaskDescription taskDescription = taskDescriptionBuilder.build();
354-
when(dockerClientInstanceMock
355-
.pullImage(taskDescription.getTeePostComputeImage()))
356-
.thenReturn(true);
357341
when(smsService.createTeeSession(workerpoolAuthorization))
358342
.thenReturn(secureSession);
359343
when(preComputeProperties.getImage()).thenReturn(PRE_COMPUTE_IMAGE);

0 commit comments

Comments
 (0)