From 1ceb801e65599a457ec52644a7c5875f3ca5d012 Mon Sep 17 00:00:00 2001 From: Christoph Ostarek Date: Thu, 6 Jun 2024 16:59:58 +0200 Subject: [PATCH 1/3] pod: change PURGING state PURGING state does not exist anymore, use HALTING instead Signed-off-by: Christoph Ostarek --- pkg/openevec/pod.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/openevec/pod.go b/pkg/openevec/pod.go index 6018ab6f1..2a36e1749 100644 --- a/pkg/openevec/pod.go +++ b/pkg/openevec/pod.go @@ -559,8 +559,8 @@ func (openEVEC *OpenEVEC) PodModify(appName string, podNetworks, portPublish, ac if needPurge { processingFunction := func(im *info.ZInfoMsg) bool { if im.Ztype == info.ZInfoTypes_ZiApp { - // waiting for purging state - if im.GetAinfo().State == info.ZSwState_PURGING { + // waiting for halting state + if im.GetAinfo().State == info.ZSwState_HALTING { return true } } From a8791ab1afc128eb88e70ee314c6307ed0506f5d Mon Sep 17 00:00:00 2001 From: Christoph Ostarek Date: Thu, 6 Jun 2024 18:59:32 +0200 Subject: [PATCH 2/3] app_local_info: send PURGING/RESTARTING cmd but expect HALTING state Signed-off-by: Christoph Ostarek --- tests/eclient/testdata/app_local_info.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/eclient/testdata/app_local_info.txt b/tests/eclient/testdata/app_local_info.txt index e68a9e21c..7d72659c6 100644 --- a/tests/eclient/testdata/app_local_info.txt +++ b/tests/eclient/testdata/app_local_info.txt @@ -192,6 +192,10 @@ fi DN="$1" TIMESTAMP="${2:-0}" CMD="${3:-COMMAND_UNSPECIFIED}" +EXPECTED_CMD="$CMD" +if [ "$CMD" = "RESTARTING" || "$CMD" = "PURGING" ]; then + EXPECTED_CMD="HALTING" +fi EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "eden.eden-bin"}} CONFIG="{\"displayname\": \"$DN\", \"timestamp\": $TIMESTAMP, \"command\": \"$CMD\"}" @@ -199,7 +203,7 @@ CONFIG="{\"displayname\": \"$DN\", \"timestamp\": $TIMESTAMP, \"command\": \"$CM while true; do echo "$CONFIG" | $EDEN sdn fwd eth0 {{template "mngr_port"}} -- {{template "ssh"}} 'cat > {{template "app_cmd_file"}}' APP_CMD_FILE_CONTENT="$($EDEN sdn fwd eth0 {{template "mngr_port"}} -- {{template "ssh"}} "cat {{template "app_cmd_file"}}")" - echo "$APP_CMD_FILE_CONTENT" | grep "$CMD" && break + echo "$APP_CMD_FILE_CONTENT" | grep "$EXPECTED_CMD" && break sleep 1 done From db28fa0147d9aba84aa5f0654967bbe07e959062 Mon Sep 17 00:00:00 2001 From: Christoph Ostarek Date: Fri, 7 Jun 2024 00:42:56 +0200 Subject: [PATCH 3/3] github: test with newest EVE Signed-off-by: Christoph Ostarek --- .github/workflows/eden.yml | 2 +- pkg/defaults/defaults.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/eden.yml b/.github/workflows/eden.yml index 88b19cf0d..e78e08f34 100644 --- a/.github/workflows/eden.yml +++ b/.github/workflows/eden.yml @@ -15,5 +15,5 @@ jobs: name: Execute Eden test workflow uses: ./.github/workflows/test.yml with: - eve_image: "lfedge/eve:11.7.0" + eve_image: "lfedge/eve:12.4.0" diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go index d4017c7c7..13ea6727f 100644 --- a/pkg/defaults/defaults.go +++ b/pkg/defaults/defaults.go @@ -53,7 +53,7 @@ const ( DefaultRegistryPort = 5050 //tags, versions, repos - DefaultEVETag = "11.7.0" // DefaultEVETag tag for EVE image + DefaultEVETag = "12.4.0" // DefaultEVETag tag for EVE image DefaultAdamTag = "0.0.43" DefaultRedisTag = "7" DefaultRegistryTag = "2.7"