Skip to content

Commit 8dbacb6

Browse files
committed
run tests from docker image directly
Signed-off-by: Avi Deitcher <[email protected]>
1 parent 00efce0 commit 8dbacb6

File tree

3 files changed

+58
-2
lines changed

3 files changed

+58
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
eden.escript.test -test.run TestEdenScripts/update_eve_image_http -test.timeout 60m
2+
eden.escript.test -test.run TestEdenScripts/update_eve_image_oci -test.timeout 60m
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Default EVE version to update
2+
{{$eve_ver := "6.0.0"}}
3+
4+
# Obtain EVE version from environment variable EVE_VERSION
5+
{{$env := EdenGetEnv "EVE_VERSION"}}
6+
7+
# If environment variable EVE_VERSION set, use it instead of default
8+
{{if $env}}{{$eve_ver = $env}}{{end}}
9+
10+
# Obtain eve.hv from config
11+
{{$eve_hv := EdenConfig "eve.hv"}}
12+
13+
# Obtain eve.arch from config
14+
{{$eve_arch := EdenConfig "eve.arch"}}
15+
16+
# Combine variables into $short_version
17+
{{$short_version := printf "%s-%s-%s" $eve_ver $eve_hv $eve_arch}}
18+
19+
# Use eden.lim.test for access Infos with timewait 30m
20+
{{$test := "test eden.lim.test -test.v -timewait 30m -test.run TestInfo"}}
21+
22+
# Decrease update testing time
23+
eden controller edge-node update --config timer.test.baseimage.update=30
24+
25+
# Send command to update eveimage from OCI image
26+
message 'EVE update request'
27+
eden -t 10m controller edge-node eveimage-update oci://docker.io/lfedge/eve:{{$eve_ver}}-{{$eve_hv}}-{{$eve_arch}} -m adam://
28+
29+
# Check stderr, it must be empty
30+
! stderr .
31+
32+
# Run monitoring of Info messages to obtain info with PartitionState inprogress or active and previously defined ShortVersion
33+
message 'Waiting for EVE update...'
34+
{{$test}} -out InfoContent.dinfo.SwList[0].ShortVersion 'InfoContent.dinfo.SwList[0].PartitionState:active InfoContent.dinfo.SwList[0].ShortVersion:{{ $short_version }}'
35+
36+
# Check stdout of previous command. Expected to get previously defined ShortVersion
37+
stdout '{{ $short_version }}'
38+
39+
# Reset EVE version
40+
test eden.escript.test -test.run TestEdenScripts/revert_eve_image_update -test.v -testdata {{EdenConfig "eden.tests"}}/update_eve_image/testdata/
41+
42+
# Reset EVE config
43+
eden eve reset
44+
45+
# Test's config file
46+
-- eden-config.yml --
47+
test:
48+
controller: adam://{{EdenConfig "adam.ip"}}:{{EdenConfig "adam.port"}}
49+
eve:
50+
{{EdenConfig "eve.name"}}:
51+
onboard-cert: {{EdenConfigPath "eve.cert"}}
52+
serial: "{{EdenConfig "eve.serial"}}"
53+
model: {{EdenConfig "eve.devmodel"}}

tests/workflow/eden.workflow.tests.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,13 @@ eden.escript.test -testdata ../eclient/testdata/ -test.run TestEdenScripts/eclie
119119
/bin/echo Eden Reboot test (33/{{$tests}})
120120
eden.escript.test -test.run TestEdenScripts/reboot_test
121121
{{ if ne $workflow "small" }}
122-
/bin/echo Eden base OS update (34/{{$tests}})
122+
/bin/echo Eden base OS update http (34/{{$tests}})
123123
eden.escript.test -testdata ../update_eve_image/testdata/ -test.run TestEdenScripts/update_eve_image_http
124+
/bin/echo Eden base OS update oci (35/{{$tests}})
125+
eden.escript.test -testdata ../update_eve_image/testdata/ -test.run TestEdenScripts/update_eve_image_oci
124126
{{end}}
125127

126128
{{if (eq $stop "y")}}
127-
/bin/echo Eden stop (35/{{$tests}})
129+
/bin/echo Eden stop (36/{{$tests}})
128130
eden.escript.test -test.run TestEdenScripts/eden_stop
129131
{{end}}

0 commit comments

Comments
 (0)