Skip to content

Commit 6470405

Browse files
PierreJeanjacquotPierreJeanjacquot
authored
chore update test stack (#399)
2 parents a59660b + 0fd8dcb commit 6470405

File tree

2 files changed

+42
-58
lines changed

2 files changed

+42
-58
lines changed

‎packages/sdk/.drone.yml‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ steps:
5959

6060
- name: bellecour-fork
6161
detach: true
62-
image: ghcr.io/foundry-rs/foundry:latest
62+
image: ghcr.io/foundry-rs/foundry:v1.0.0
6363
pull: always
6464
expose:
6565
- 8545
@@ -197,23 +197,18 @@ steps:
197197
- graphnode
198198

199199
- name: sms
200-
image: iexechub/iexec-sms:7.1.0
200+
image: iexechub/iexec-sms:8.7.0
201201
detach: true
202202
environment:
203-
TZ: Europe/Paris
203+
JAVA_TOOL_OPTIONS: '-Xmx256M'
204204
IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://bellecour-fork:8545
205205
IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
206-
IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-pre-compute:7.1.0-sconify-5.3.15-debug
207-
IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 9f0f782d6edc611baa23ca0978f555ee58ea70e092640c961e75c25e9e4b0f22
208-
IEXEC_TEE_WORKER_PRE_COMPUTE_HEAP_SIZE_GB: 4
209-
IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-post-compute:7.1.1-sconify-5.3.15-debug
210-
IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: face1376b97131e2dc75a556381d47a2e03bed9e1bc11e462471f99d1eefae50
211-
IEXEC_TEE_WORKER_POST_COMPUTE_HEAP_SIZE_GB: 4
212-
IEXEC_IGNORED_SGX_ADVISORIES: INTEL-SA-00161,INTEL-SA-00289,INTEL-SA-00334,INTEL-SA-00381,INTEL-SA-00389,INTEL-SA-00220,INTEL-SA-00270,INTEL-SA-00293,INTEL-SA-00320,INTEL-SA-00329,INTEL-SA-00477
213-
IEXEC_SCONE_TOLERATED_INSECURE_OPTIONS: debug-mode,hyperthreading,outdated-tcb
214-
IEXEC_SMS_DISPLAY_DEBUG_SESSION: 'true'
215-
IEXEC_SCONE_CAS_HOST: foo
216-
IEXEC_SMS_IMAGE_LAS_IMAGE: foo
206+
IEXEC_SMS_TEE_RUNTIME_FRAMEWORK: scone
207+
IEXEC_SMS_IMAGE_LAS_IMAGE: 'las-image'
208+
IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: 'pre-compute-image'
209+
IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 'pre-compute-fingerprint'
210+
IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: 'post-compute-image'
211+
IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: 'post-compute-fingerprint'
217212
expose:
218213
- 13300
219214
depends_on:
@@ -227,23 +222,18 @@ steps:
227222
- sms
228223

229224
- name: sms-debug
230-
image: iexechub/iexec-sms:7.1.0
225+
image: iexechub/iexec-sms:8.7.0
231226
detach: true
232227
environment:
233-
TZ: Europe/Paris
228+
JAVA_TOOL_OPTIONS: '-Xmx256M'
234229
IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://bellecour-fork:8545
235230
IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
236-
IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-pre-compute:7.1.0-sconify-5.3.15-debug
237-
IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 9f0f782d6edc611baa23ca0978f555ee58ea70e092640c961e75c25e9e4b0f22
238-
IEXEC_TEE_WORKER_PRE_COMPUTE_HEAP_SIZE_GB: 4
239-
IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-post-compute:7.1.1-sconify-5.3.15-debug
240-
IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: face1376b97131e2dc75a556381d47a2e03bed9e1bc11e462471f99d1eefae50
241-
IEXEC_TEE_WORKER_POST_COMPUTE_HEAP_SIZE_GB: 4
242-
IEXEC_IGNORED_SGX_ADVISORIES: INTEL-SA-00161,INTEL-SA-00289,INTEL-SA-00334,INTEL-SA-00381,INTEL-SA-00389,INTEL-SA-00220,INTEL-SA-00270,INTEL-SA-00293,INTEL-SA-00320,INTEL-SA-00329,INTEL-SA-00477
243-
IEXEC_SCONE_TOLERATED_INSECURE_OPTIONS: debug-mode,hyperthreading,outdated-tcb
244-
IEXEC_SMS_DISPLAY_DEBUG_SESSION: 'true'
245-
IEXEC_SCONE_CAS_HOST: foo
246-
IEXEC_SMS_IMAGE_LAS_IMAGE: foo
231+
IEXEC_SMS_TEE_RUNTIME_FRAMEWORK: scone
232+
IEXEC_SMS_IMAGE_LAS_IMAGE: 'las-image'
233+
IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: 'pre-compute-image'
234+
IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 'pre-compute-fingerprint'
235+
IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: 'post-compute-image'
236+
IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: 'post-compute-fingerprint'
247237
expose:
248238
- 13300
249239
depends_on:

‎packages/sdk/tests/docker-compose.yml‎

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,59 @@
11
services:
22
bellecour-fork:
33
restart: 'no'
4-
image: ghcr.io/foundry-rs/foundry:latest
5-
platform: linux/amd64
4+
image: ghcr.io/foundry-rs/foundry:v1.0.0
65
entrypoint: anvil
76
command: '--host 0.0.0.0 --port 8545 --block-time 1 --hardfork berlin --fork-url $BELLECOUR_FORK_URL --fork-block-number $BELLECOUR_FORK_BLOCK --chain-id 134 --gas-limit 6700000 --gas-price 0'
87
expose:
98
- 8545
109
ports:
1110
- 8545:8545
1211
healthcheck:
13-
test: wget http://0.0.0.0:8545/ -q --post-data "{\"jsonrpc\":\"2.0\",\"method\":\"eth_chainId\",\"params\":[],\"id\":1}"
12+
# check port 8545 is open without nc
13+
test: (echo >/dev/tcp/$(hostname)/8545) &>/dev/null
1414
interval: 10s
1515
timeout: 5s
1616
retries: 3
1717
start_period: 30s
1818

1919
sms:
20-
image: iexechub/iexec-sms:7.1.0
20+
image: iexechub/iexec-sms:8.7.0
2121
restart: unless-stopped
2222
environment:
23-
TZ: Europe/Paris
23+
JAVA_TOOL_OPTIONS: '-Xmx256M'
2424
IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://bellecour-fork:8545
2525
IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
26-
IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-pre-compute:7.1.0-sconify-5.3.15-debug
27-
IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 9f0f782d6edc611baa23ca0978f555ee58ea70e092640c961e75c25e9e4b0f22
28-
IEXEC_TEE_WORKER_PRE_COMPUTE_HEAP_SIZE_GB: 4
29-
IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-post-compute:7.1.1-sconify-5.3.15-debug
30-
IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: face1376b97131e2dc75a556381d47a2e03bed9e1bc11e462471f99d1eefae50
31-
IEXEC_TEE_WORKER_POST_COMPUTE_HEAP_SIZE_GB: 4
32-
IEXEC_IGNORED_SGX_ADVISORIES: INTEL-SA-00161,INTEL-SA-00289,INTEL-SA-00334,INTEL-SA-00381,INTEL-SA-00389,INTEL-SA-00220,INTEL-SA-00270,INTEL-SA-00293,INTEL-SA-00320,INTEL-SA-00329,INTEL-SA-00477
33-
IEXEC_SCONE_TOLERATED_INSECURE_OPTIONS: debug-mode,hyperthreading,outdated-tcb
34-
IEXEC_SMS_DISPLAY_DEBUG_SESSION: 'true'
35-
IEXEC_SCONE_CAS_HOST: foo
36-
IEXEC_SMS_IMAGE_LAS_IMAGE: foo
26+
IEXEC_SMS_TEE_RUNTIME_FRAMEWORK: scone
27+
IEXEC_SMS_IMAGE_LAS_IMAGE: 'las-image'
28+
IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: 'pre-compute-image'
29+
IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 'pre-compute-fingerprint'
30+
IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: 'post-compute-image'
31+
IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: 'post-compute-fingerprint'
3732
ports:
3833
- 13300:13300
34+
healthcheck:
35+
test: curl -f localhost:13300/actuator/health || exit 1
3936
depends_on:
4037
bellecour-fork:
4138
condition: service_healthy
4239

4340
sms-debug:
44-
image: iexechub/iexec-sms:7.1.0
41+
image: iexechub/iexec-sms:8.7.0
4542
restart: unless-stopped
4643
environment:
47-
TZ: Europe/Paris
44+
JAVA_TOOL_OPTIONS: '-Xmx256M'
4845
IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://bellecour-fork:8545
4946
IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
50-
IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-pre-compute:7.1.0-sconify-5.3.15-debug
51-
IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 9f0f782d6edc611baa23ca0978f555ee58ea70e092640c961e75c25e9e4b0f22
52-
IEXEC_TEE_WORKER_PRE_COMPUTE_HEAP_SIZE_GB: 4
53-
IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-post-compute:7.1.1-sconify-5.3.15-debug
54-
IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: face1376b97131e2dc75a556381d47a2e03bed9e1bc11e462471f99d1eefae50
55-
IEXEC_TEE_WORKER_POST_COMPUTE_HEAP_SIZE_GB: 4
56-
IEXEC_IGNORED_SGX_ADVISORIES: INTEL-SA-00161,INTEL-SA-00289,INTEL-SA-00334,INTEL-SA-00381,INTEL-SA-00389,INTEL-SA-00220,INTEL-SA-00270,INTEL-SA-00293,INTEL-SA-00320,INTEL-SA-00329,INTEL-SA-00477
57-
IEXEC_SCONE_TOLERATED_INSECURE_OPTIONS: debug-mode,hyperthreading,outdated-tcb
58-
IEXEC_SMS_DISPLAY_DEBUG_SESSION: 'true'
59-
IEXEC_SCONE_CAS_HOST: foo
60-
IEXEC_SMS_IMAGE_LAS_IMAGE: foo
47+
IEXEC_SMS_TEE_RUNTIME_FRAMEWORK: scone
48+
IEXEC_SMS_IMAGE_LAS_IMAGE: 'las-image'
49+
IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: 'pre-compute-image'
50+
IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 'pre-compute-fingerprint'
51+
IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: 'post-compute-image'
52+
IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: 'post-compute-fingerprint'
6153
ports:
6254
- 13301:13300
55+
healthcheck:
56+
test: curl -f localhost:13300/actuator/health || exit 1
6357
depends_on:
6458
bellecour-fork:
6559
condition: service_healthy
@@ -249,9 +243,9 @@ services:
249243
graphnode:
250244
condition: service_healthy
251245
sms:
252-
condition: service_started
246+
condition: service_healthy
253247
sms-debug:
254-
condition: service_started
248+
condition: service_healthy
255249
market-watcher:
256250
condition: service_started
257251
market-api:

0 commit comments

Comments
 (0)