Update EVE, eclient and esever defaults

In order to use the same version of eclient we should move its tag and
image into config

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>

.github/workflows/eden.yml

@@ -61,9 +61,9 @@ jobs:
         if: ${{ always() }}
         run: |
           ./eden log --format json > trace.log || echo "no log"
-          ./eden info > info.log || echo "no info"
-          ./eden metric > metric.log || echo "no metric"
-          ./eden netstat > netstat.log || echo "no netstat"
+          ./eden info --format json > info.log || echo "no info"
+          ./eden metric --format json > metric.log || echo "no metric"
+          ./eden netstat --format json > netstat.log || echo "no netstat"
           cp dist/default-eve.log console.log || echo "no device log"
           docker logs eden_adam > adam.log 2>&1 || echo "no adam log"
       - name: Log counting

.github/workflows/eden_gcp.yml

@@ -123,9 +123,9 @@ jobs:
         if: ${{ always() }}
         run: |
           ./eden log --format json > trace.log || echo "no log"
-          ./eden info > info.log || echo "no info"
-          ./eden metric > metric.log || echo "no metric"
-          ./eden netstat > netstat.log || echo "no netstat"
+          ./eden info --format json > info.log || echo "no info"
+          ./eden metric --format json > metric.log || echo "no metric"
+          ./eden netstat --format json > netstat.log || echo "no netstat"
           docker logs eden_adam > adam.log 2>&1 || echo "no adam log"
           ./eden utils gcp vm log --vm-name eve-eden-actions-${{ matrix.hv }}-${{ matrix.fs }}-${{github.run_number}} -k "${{ steps.gcpauth.outputs.credentials_file_path }}" > console.log || echo "no device log"
       - name: Clean

Makefile

@@ -11,10 +11,7 @@ ESERVER_TAG ?= "lfedge/eden-http-server"
 # ESERVER_DIR is the directory with eserver Dockerfile to build
 ESERVER_DIR=$(CURDIR)/eserver
 # ESERVER_VERSION is the version of eserver image to build
-ESERVER_VERSION ?= $(shell git tag -l --contains HEAD)
-ifeq ($(ESERVER_VERSION),)
-	ESERVER_VERSION = $(shell git describe --always)
-endif
+ESERVER_VERSION ?= $(shell git rev-parse --short HEAD:eserver)
 
 # PROCESSING_TAG is the tag for processing image to build
 PROCESSING_TAG ?= "lfedge/eden-processing"

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/containerd/cgroups v1.0.4 // indirect
 	github.com/containerd/containerd v1.6.6
 	github.com/containerd/continuity v0.3.0 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.12.0 // indirect
 	github.com/docker/distribution v2.8.1+incompatible
 	github.com/docker/docker v20.10.17+incompatible
 	github.com/docker/go-connections v0.4.0
@@ -22,10 +23,9 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/compress v1.15.7 // indirect
-	github.com/lf-edge/eden/eserver v0.0.0-20220706094242-b8430cfbaa15
+	github.com/lf-edge/eden/eserver v0.0.0-20220711180217-6e2bfa9c3f67
 	github.com/lf-edge/edge-containers v0.0.0-20220320131500-9d9f95d81e2c
-	github.com/lf-edge/eve/api/go v0.0.0-20220710201139-9b4d42ba944e
+	github.com/lf-edge/eve/api/go v0.0.0-20220711144346-0659e3b03496
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
 	github.com/mcuadros/go-lookup v0.0.0-20200831155250-80f87a4fa5ee
 	github.com/moby/sys/mount v0.3.3 // indirect
@@ -34,7 +34,7 @@ require (
 	github.com/opencontainers/runc v1.1.3 // indirect
 	github.com/packethost/packngo v0.25.0
 	github.com/prometheus/client_golang v1.12.2 // indirect
-	github.com/prometheus/common v0.35.0 // indirect
+	github.com/prometheus/common v0.36.0 // indirect
 	github.com/rogpeppe/go-internal v1.6.2
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
 	github.com/sirupsen/logrus v1.8.1
@@ -49,15 +49,12 @@ require (
 	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
 	golang.org/x/net v0.0.0-20220708220712-1185a9018129
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
+	golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
 	golang.org/x/term v0.0.0-20220526004731-065cf7ba2467
 	google.golang.org/api v0.86.0
-	google.golang.org/genproto v0.0.0-20220708155623-50e5f4832e73 // indirect
+	google.golang.org/genproto v0.0.0-20220712132514-bdd2acd4974d // indirect
 	google.golang.org/protobuf v1.28.0
 	gopkg.in/errgo.v2 v2.1.0
 	gopkg.in/yaml.v2 v2.4.0
 	oras.land/oras-go v1.2.0
 )
-
-replace github.com/lf-edge/eden/eserver => ./eserver
-
-replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20190205005809-0d3efadf0154

pkg/defaults/defaults.go

@@ -52,7 +52,7 @@ const (
 	DefaultRegistryPort         = 5050
 
 	//tags, versions, repos
-	DefaultEVETag               = "0.0.0-master-7ab56bde" // DefaultEVETag tag for EVE image
+	DefaultEVETag               = "8.6.0" // DefaultEVETag tag for EVE image
 	DefaultAdamTag              = "0.0.39"
 	DefaultRedisTag             = "7"
 	DefaultRegistryTag          = "2.7"
@@ -72,9 +72,12 @@ const (
 
 	DefaultRedisPasswordFile = "redis.pass"
 
-	DefaultEServerTag          = "4fd3d15"
+	DefaultEServerTag          = "6e2bfa9"
 	DefaultEServerContainerRef = "lfedge/eden-http-server"
 
+	DefaultEClientTag          = "6e2bfa9"
+	DefaultEClientContainerRef = "lfedge/eden-eclient"
+
 	//DefaultRepeatCount is repeat count for requests
 	DefaultRepeatCount = 20
 	//DefaultRepeatTimeout is time wait for next attempt

pkg/defaults/templates.go

@@ -192,6 +192,13 @@ eden:
         #force eserver rebuild
         force: {{parse "eden.eserver.force"}}
 
+    #eclient is tool we use in tests
+    eclient:
+        #tag of eclient container
+        tag: '{{parse "eden.eclient.tag"}}'
+        #image of eclient container
+        image: '{{parse "eden.eclient.image"}}'
+
     #directory to save certs
     certs-dist: '{{parse "eden.certs-dist"}}'
 

pkg/utils/config.go

@@ -421,6 +421,10 @@ func generateConfigFileFromTemplate(filePath string, templateString string, cont
 			return defaults.DefaultEServerTag
 		case "eden.eserver.force":
 			return true
+		case "eden.eclient.tag":
+			return defaults.DefaultEClientTag
+		case "eden.eclient.image":
+			return defaults.DefaultEClientContainerRef
 		case "eden.certs-dist":
 			return certsDist
 		case "eden.bin-dist":

tests/eclient/testdata/acl.txt

@@ -10,6 +10,8 @@
 
 {{$network_name := "n1"}}
 
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
+
 [!exec:bash] stop
 [!exec:sleep] stop
 [!exec:ssh] stop
@@ -34,9 +36,9 @@ eden network create 10.11.12.0/24 -n {{$network_name}} -s {{$fake_domain}}:$host
 test eden.network.test -test.v -timewait 10m ACTIVATED {{$network_name}}
 
 # First app is only allowed to access github.com and $long_domain.
-eden pod deploy -n curl-acl1 --memory=512MB docker://lfedge/eden-eclient:d9eb23f -p 2223:22 --networks={{$network_name}} --acl={{$network_name}}:github.com --acl={{$network_name}}:{{$long_domain}}:allow --acl={{$network_name}}:google.com:drop
+eden pod deploy -n curl-acl1 --memory=512MB {{template "eclient_image"}} -p 2223:22 --networks={{$network_name}} --acl={{$network_name}}:github.com --acl={{$network_name}}:{{$long_domain}}:allow --acl={{$network_name}}:google.com:drop
 # Second app is only allowed to access $long_domain and $fake_domain.
-eden pod deploy -n curl-acl2 --memory=512MB docker://lfedge/eden-eclient:d9eb23f -p 2224:22 --networks={{$network_name}} --acl={{$network_name}}:{{$long_domain}} --acl={{$network_name}}:{{$fake_domain}}:allow --acl={{$network_name}}:ieee.org:drop
+eden pod deploy -n curl-acl2 --memory=512MB {{template "eclient_image"}} -p 2224:22 --networks={{$network_name}} --acl={{$network_name}}:{{$long_domain}} --acl={{$network_name}}:{{$fake_domain}}:allow --acl={{$network_name}}:ieee.org:drop
 
 test eden.app.test -test.v -timewait 15m RUNNING curl-acl1 curl-acl2
 

tests/eclient/testdata/air-gapped-switch.txt

@@ -7,6 +7,7 @@
 {{define "mac2"}}00:01:02:03:04:02{{end}}
 {{define "ip2"}}11.12.13.12{{end}}
 {{define "ssh"}}ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=no -i {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa root@{{end}}
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 
 [!exec:bash] stop
 [!exec:sleep] stop
@@ -29,8 +30,8 @@ eden network create --type switch --uplink none -n direct
 test eden.network.test -test.v -timewait 20m ACTIVATED indirect direct
 
 message 'Starting applications'
-eden pod deploy -v debug -n eclient1 docker://lfedge/eden-eclient:d9eb23f -p {{template "port1"}}:22 --networks=indirect --networks=direct:{{template "mac1"}} --memory=512MB
-eden pod deploy -v debug -n eclient2 docker://lfedge/eden-eclient:d9eb23f -p {{template "port2"}}:22 --networks=indirect --networks=direct:{{template "mac2"}} --memory=512MB
+eden pod deploy -v debug -n eclient1 {{template "eclient_image"}} -p {{template "port1"}}:22 --networks=indirect --networks=direct:{{template "mac1"}} --memory=512MB
+eden pod deploy -v debug -n eclient2 {{template "eclient_image"}} -p {{template "port2"}}:22 --networks=indirect --networks=direct:{{template "mac2"}} --memory=512MB
 
 message 'Waiting for running state'
 test eden.app.test -test.v -timewait 15m RUNNING eclient1 eclient2

tests/eclient/testdata/app_dhcp.txt

@@ -19,6 +19,7 @@ source .env
 
 {{define "port"}}2223{{end}}
 {{define "ssh"}}ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=no -i {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa -p {{template "port"}} root@{{end}}
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 
 exec chmod 600 {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa
 
@@ -35,8 +36,8 @@ eden network create --type switch --uplink none -n switch
 test eden.network.test -test.v -timewait 10m ACTIVATED nat switch
 
 message 'Starting applications'
-eden pod deploy -v debug -n dhcp-server --memory=512MB --networks=switch --mount=src={{EdenConfig "eden.tests"}}/eclient/testdata/dhcp-server,dst=/app docker://lfedge/eden-docker-test:83cfe07
-eden pod deploy -v debug -n eclient --memory=512MB --networks=nat --networks=switch -p {{template "port"}}:22 docker://lfedge/eden-eclient:77dc00b
+eden pod deploy -v debug -n dhcp-server --memory=512MB --networks=switch --mount=src={{EdenConfig "eden.tests"}}/eclient/testdata/dhcp-server,dst=/app {{template "eclient_image"}}
+eden pod deploy -v debug -n eclient --memory=512MB --networks=nat --networks=switch -p {{template "port"}}:22 {{template "eclient_image"}}
 test eden.app.test -test.v -timewait 20m RUNNING dhcp-server eclient
 
 message 'Checking accessibility'

tests/eclient/testdata/app_local_info.txt

@@ -7,6 +7,7 @@
 {{define "app_cmd_file"}}/mnt/app-command.json{{end}}
 {{define "network"}}n1{{end}}
 {{define "ssh"}}ssh -q -o ConnectTimeout=10 -o StrictHostKeyChecking=no -o PasswordAuthentication=no -i {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa root@{{end}}
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 
 [!exec:bash] stop
 [!exec:sleep] stop
@@ -28,7 +29,7 @@ eden -t 1m network create 10.11.12.0/24 -n {{template "network"}}
 test eden.network.test -test.v -timewait 10m ACTIVATED {{template "network"}}
 
 # Deploy local-manager
-eden pod deploy -n local-manager --memory=512MB docker://lfedge/eden-eclient:afaa332 -p {{template "mngr_port"}}:22 --networks={{template "network"}}
+eden pod deploy -n local-manager --memory=512MB {{template "eclient_image"}} -p {{template "mngr_port"}}:22 --networks={{template "network"}}
 test eden.app.test -test.v -timewait 10m RUNNING local-manager
 
 # Wait for ssh access
@@ -53,7 +54,7 @@ stdout 'local-manager'
 ! stderr .
 
 # STEP 2: Deploy the second app
-eden pod deploy -n app1 --memory=512MB docker://lfedge/eden-eclient:afaa332 -p {{template "app_port"}}:22 --networks={{template "network"}}
+eden pod deploy -n app1 --memory=512MB {{template "eclient_image"}} -p {{template "app_port"}}:22 --networks={{template "network"}}
 test eden.app.test -test.v -timewait 10m RUNNING app1
 
 # Wait for ssh access
@@ -174,7 +175,7 @@ done
 EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "eden.eden-bin"}}
 HOST=$($EDEN eve ip)
 ARGS="--token={{template "token"}}"
-{{template "ssh"}}$HOST -p {{template "mngr_port"}} "/root/local_manager $ARGS &>/dev/null &"
+{{template "ssh"}}$HOST -p {{template "mngr_port"}} "/root/local_manager $ARGS &>/proc/1/fd/1 &"
 
 -- get-app-ip.sh --
 EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "eden.eden-bin"}}

tests/eclient/testdata/app_logs.txt

@@ -1,11 +1,12 @@
 # Test of App logs functionality
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 
-eden pod deploy -n eclient --memory=512MB docker://lfedge/eden-eclient:d9eb23f
+eden pod deploy -n eclient --memory=512MB {{template "eclient_image"}}
 
 # We run it in background as of logs and info are async
 test eden.app.test -test.v -timewait 15m RUNNING eclient &
 
-# We check for pattern exists in lfedge/eden-eclient:d9eb23f
+# We check for pattern exists in {{template "eclient_image"}}
 message 'Waiting for App logs'
 test eden.lim.test -test.v -timewait 15m -test.run TestAppLog -app eclient -out content 'content:.*ubuntu-http.*'
 stdout 'ubuntu-http-server'
@@ -20,7 +21,7 @@ eden pod start eclient
 # We run it in background as of logs and info are async
 test eden.app.test -test.v -timewait 5m RUNNING eclient &
 
-# We check for pattern exists in lfedge/eden-eclient:d9eb23f
+# We check for pattern exists in {{template "eclient_image"}}
 message 'Waiting for App logs after app restart'
 test eden.lim.test -test.v -timewait 5m -test.run TestAppLog -app eclient -out content 'content:.*ubuntu-http.*'
 stdout 'ubuntu-http-server'

tests/eclient/testdata/app_nonat.txt

@@ -2,6 +2,7 @@
 
 {{define "port"}}2223{{end}}
 {{define "ssh"}}ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=no -i {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa -p {{template "port"}} root@{{end}}
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 
 [!exec:bash] stop
 [!exec:sleep] stop
@@ -24,7 +25,7 @@ eden network create --type switch --uplink eth0 -n direct
 test eden.network.test -test.v -timewait 10m ACTIVATED indirect direct
 
 message 'Starting applications'
-eden pod deploy -v debug -n eclient docker://lfedge/eden-eclient:d9eb23f -p {{template "port"}}:22 --networks=indirect --networks=direct --memory=512MB
+eden pod deploy -v debug -n eclient {{template "eclient_image"}} -p {{template "port"}}:22 --networks=indirect --networks=direct --memory=512MB
 
 message 'Waiting of running'
 test eden.app.test -test.v -timewait 30m RUNNING eclient

tests/eclient/testdata/com-pt_test.txt

@@ -4,6 +4,7 @@
 
 {{define "port"}}2223{{end}}
 {{define "ssh"}} ssh -oServerAliveInterval=10 -oConnectTimeout=10 -oStrictHostKeyChecking=no -oPasswordAuthentication=no -i {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa -p {{template "port"}} root@$HOST {{end}}
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 
 [!exec:bash] stop
 [!exec:sleep] stop
@@ -16,7 +17,7 @@ exec chmod 600 {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa
 # Starting of reboot detector with a 2 reboot limit
 ! test eden.reboot.test -test.v -timewait 10m -reboot=0 -count=2 &
 
-eden pod deploy -n eclient --memory=512MB docker://lfedge/eden-eclient:d9eb23f -p {{template "port"}}:22
+eden pod deploy -n eclient --memory=512MB {{template "eclient_image"}} -p {{template "port"}}:22
 
 test eden.app.test -test.v -timewait 20m RUNNING eclient
 

tests/eclient/testdata/dev_local_info.txt

@@ -8,6 +8,7 @@
 {{define "dev_cmd_file"}}/mnt/dev-command.json{{end}}
 {{define "network"}}n1{{end}}
 {{define "ssh"}}ssh -q -o ConnectTimeout=10 -o StrictHostKeyChecking=no -o PasswordAuthentication=no -i {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa root@{{end}}
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 
 [!exec:bash] stop
 [!exec:sleep] stop
@@ -29,7 +30,7 @@ eden -t 1m network create 10.11.12.0/24 -n {{template "network"}}
 test eden.network.test -test.v -timewait 10m ACTIVATED {{template "network"}}
 
 # Deploy local-manager
-eden pod deploy -n local-manager --memory=512MB docker://lfedge/eden-eclient:99d7f62 -p {{template "mngr_port"}}:22 --networks={{template "network"}}
+eden pod deploy -n local-manager --memory=512MB {{template "eclient_image"}} -p {{template "mngr_port"}}:22 --networks={{template "network"}}
 test eden.app.test -test.v -timewait 10m RUNNING local-manager
 
 # Wait for ssh access
@@ -52,7 +53,7 @@ exec -t 10m bash get-devinfo-status.sh
 ! stderr .
 
 # STEP 2: Deploy the second app
-eden pod deploy -n app1 --memory=512MB docker://lfedge/eden-eclient:99d7f62 -p {{template "app_port"}}:22 --networks={{template "network"}}
+eden pod deploy -n app1 --memory=512MB {{template "eclient_image"}} -p {{template "app_port"}}:22 --networks={{template "network"}}
 test eden.app.test -test.v -timewait 10m RUNNING app1
 
 # Wait for ssh access
@@ -178,7 +179,7 @@ done
 EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "eden.eden-bin"}}
 HOST=$($EDEN eve ip)
 ARGS="--token={{template "token"}}"
-{{template "ssh"}}$HOST -p {{template "mngr_port"}} "/root/local_manager $ARGS &>/dev/null &"
+{{template "ssh"}}$HOST -p {{template "mngr_port"}} "/root/local_manager $ARGS &>/proc/1/fd/1 &"
 
 -- get-app-ip.sh --
 EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "eden.eden-bin"}}

tests/eclient/testdata/disk.txt

@@ -1,6 +1,7 @@
 # Test for additional disk connected to eclient
 
 {{$port := "2223"}}
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 
 [!exec:bash] stop
 [!exec:sleep] stop
@@ -12,7 +13,7 @@ exec chmod 600 {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa
 # Starting of reboot detector with a 1 reboot limit
 ! test eden.reboot.test -test.v -timewait=0 -reboot=0 -count=1 &
 
-eden pod deploy -n eclient-disk --memory=512MB docker://lfedge/eden-eclient:d9eb23f -p {{$port}}:22 --disks=file://{{EdenConfig "eden.root"}}/empty.qcow2
+eden pod deploy -n eclient-disk --memory=512MB {{template "eclient_image"}} -p {{$port}}:22 --disks=file://{{EdenConfig "eden.root"}}/empty.qcow2
 
 test eden.app.test -test.v -timewait 20m RUNNING eclient-disk
 

tests/eclient/testdata/eclient.txt

@@ -1,6 +1,7 @@
 # Simple test of `eclient` image functionality
 
 {{$port := "2223"}}
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 
 [!exec:bash] stop
 [!exec:sleep] stop
@@ -12,7 +13,7 @@ exec chmod 600 {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa
 # Starting of reboot detector with a 1 reboot limit
 ! test eden.reboot.test -test.v -timewait=0 -reboot=0 -count=1 &
 
-eden pod deploy -n eclient --memory=512MB docker://lfedge/eden-eclient:d9eb23f -p {{$port}}:22
+eden pod deploy -n eclient --memory=512MB {{template "eclient_image"}} -p {{$port}}:22
 
 test eden.app.test -test.v -timewait 20m RUNNING eclient
 

tests/eclient/testdata/eclients.txt

@@ -1,12 +1,13 @@
 # Apps deployment stress test
 
+{{define "eclient_image"}}docker://{{EdenConfig "eden.eclient.image"}}:{{EdenConfig "eden.eclient.tag"}}{{end}}
 {{$port := "2222"}}
 {{$test_opts := "-test.v -timewait 20m"}}
 # Number of apps
 {{$apps := EdenGetEnv "EDEN_TEST_APPS"}}
 # Time of app waiting (default -- 30 min)
 {{$time := EdenGetEnv "EDEN_TEST_TIME"}}
-# Image for app (default -- docker://lfedge/eden-eclient:d9eb23f)
+# Image for app (default -- {{template "eclient_image"}})
 {{$img := EdenGetEnv "EDEN_TEST_IMG"}}
 
 {{$devmodel := EdenConfig "eve.devmodel"}}
@@ -49,8 +50,8 @@ TAPP={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/eden.app.test
 HOST=$($EDEN eve ip)
 
 APPS="{{$apps}}"
-# Default image -- docker://lfedge/eden-eclient:d9eb23f
-IMG="{{if $img}}{{$img}}{{else}}docker://lfedge/eden-eclient:d9eb23f{{end}}"
+# Default image -- {{template "eclient_image"}}
+IMG="{{if $img}}{{$img}}{{else}}{{template "eclient_image"}}{{end}}"
 
 PORTS=""
 for i in `seq $APPS`
@@ -109,9 +110,9 @@ TAPP={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/eden.app.test
 HOST=$($EDEN eve ip)
 
 APPS="{{$apps}}"
-# Default image -- docker://lfedge/eden-eclient:d9eb23f
-#IMG="{{if $img}}{{$img}}{{else}}docker://lfedge/eden-eclient:d9eb23f{{end}}"
-IMG="{{if $img}}{{$img}}{{else}}docker://lfedge/eden-eclient:d9eb23f{{end}}"
+# Default image -- {{template "eclient_image"}}
+#IMG="{{if $img}}{{$img}}{{else}}{{template "eclient_image"}}{{end}}"
+IMG="{{if $img}}{{$img}}{{else}}{{template "eclient_image"}}{{end}}"
 
 PODS=""
 for i in `seq $APPS`