Commit 043a9c90 authored by Tycho Andersen's avatar Tycho Andersen Committed by Pavel Emelyanov

test: use .pid.inprogress file for macvlan test

Note, this depends on Pavel's patch here:
https://lists.openvz.org/pipermail/criu/2016-October/032499.html which is
not yet applied.

travis-ci: success for test: use .pid.inprogress file for macvlan test (rev2)
Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 9d417188
...@@ -6,7 +6,8 @@ if [ "$1" == "--post-start" ]; then ...@@ -6,7 +6,8 @@ if [ "$1" == "--post-start" ]; then
set -e set -e
i=0 i=0
while [ -z "$(pidof -s macvlan)" ]; do PIDF="zdtm/static/macvlan.pid.inprogress"
while [ ! -f "$PIDF" ]; do
i=$(($i+1)) i=$(($i+1))
if [ "$i" -eq "10" ]; then if [ "$i" -eq "10" ]; then
echo "failed to create macvlan test" echo "failed to create macvlan test"
...@@ -15,12 +16,14 @@ if [ "$1" == "--post-start" ]; then ...@@ -15,12 +16,14 @@ if [ "$1" == "--post-start" ]; then
sleep 1 sleep 1
done done
TPID=$(cat $PIDF)
ip link add zdtmbr0 type bridge ip link add zdtmbr0 type bridge
ip addr add 10.0.55.55/32 dev zdtmbr0 ip addr add 10.0.55.55/32 dev zdtmbr0
ip link set zdtmbr0 up ip link set zdtmbr0 up
ip link add zdtmmvlan0 link zdtmbr0 type macvlan mode bridge ip link add zdtmmvlan0 link zdtmbr0 type macvlan mode bridge
ip addr add 10.0.55.56/32 dev zdtmmvlan0 ip addr add 10.0.55.56/32 dev zdtmmvlan0
ip link set zdtmmvlan0 netns $(pidof -s macvlan) ip link set zdtmmvlan0 netns $TPID
else else
ip link del zdtmmvlan0 || true ip link del zdtmmvlan0 || true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment