Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to fix EdenGCP problems #900

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Try to fix EdenGCP problems #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae5c700
Bump default EVE-OS version to 10.9.0
giggsoff Oct 4, 2023
c8a3758
Enlarge sleep before getting IP
giggsoff Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/defaults/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const (
DefaultRegistryPort = 5050

//tags, versions, repos
DefaultEVETag = "10.4.0" // DefaultEVETag tag for EVE image
DefaultEVETag = "10.9.0" // DefaultEVETag tag for EVE image
DefaultAdamTag = "0.0.43"
DefaultRedisTag = "7"
DefaultRegistryTag = "2.7"
Expand Down
27 changes: 16 additions & 11 deletions tests/eclient/testdata/nw_switch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ message 'Waiting of running'
test eden.app.test -test.v -timewait 20m RUNNING ping1 ping2 pong

message 'Getting "pong" IP'
exec sleep 5
eden pod ps
cp stdout pod_ps
exec bash pong_ip.sh

message 'Checking accessibility'
Expand All @@ -55,9 +52,6 @@ eden pod modify pong --networks n2
test eden.app.test -test.v -timewait 15m RUNNING pong

message 'Getting new "pong" IP'
exec sleep 5
eden pod ps
cp stdout pod_ps
exec bash pong_ip.sh
exec -t 5m bash wait_ssh.sh 2223 2224

Expand All @@ -73,9 +67,6 @@ eden pod modify pong --networks n1
test eden.app.test -test.v -timewait 15m RUNNING pong

message 'Getting new "pong" IP'
exec sleep 5
eden pod ps
cp stdout pod_ps
exec bash pong_ip.sh

message 'Testing of 1st network again'
Expand Down Expand Up @@ -120,8 +111,22 @@ do
done

-- pong_ip.sh --
echo export PONG_IP=$(grep '^ *pong\s' pod_ps | cut -f 4) > env
cat env
EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "eden.eden-bin"}}

for i in `seq 10`
do
sleep 10
PONG_IP=$($EDEN pod ps | grep '^ *pong\s' | cut -f 4)
if [ $PONG_IP != "-" ]; then
echo export PONG_IP=$PONG_IP > env
cat env
exit 0
fi
done

$EDEN pod ps
echo "failed to get PONG IP"
exit 1

-- ping.sh --
EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "eden.eden-bin"}}
Expand Down
Loading