diff options
| author |   blsaws <bryan.sullivan@att.com> | 2016-09-12 15:23:31 -0700 |
|---|---|---|
| committer | blsaws <bryan.sullivan@att.com> | 2016-09-12 15:23:31 -0700 |
| commit | e34fea7f4f256140c8edea4386997b303f593755 (patch) | |
| tree | a74a3cb55707b14dfe2f677db9b9d54c4a2b50b8 | |
| parent | b45ac89fde60a16ee921b7e3c24df08f01f7716b (diff) | |
Add /bin/bash to prevent docker hanging
JIRA: MODELS-23
Change-Id: I18d8a950bc065ad6e17534073792841ccb247f97
Signed-off-by: blsaws <bryan.sullivan@att.com>
| -rw-r--r-- | tests/utils/tacker-setup.sh | 1 | ||||
| -rw-r--r-- | tests/vHello.sh | 4 | ||||
| -rw-r--r-- | tests/vHello_Tacker.sh | 2 | ||||
| -rw-r--r-- | tests/xenial-server-cloudimg-amd64-disk1.img | bin | 0 -> 7790913 bytes |
4 files changed, 4 insertions, 3 deletions
diff --git a/tests/utils/tacker-setup.sh b/tests/utils/tacker-setup.sh index c3319c5..b6cb118 100644 --- a/tests/utils/tacker-setup.sh +++ b/tests/utils/tacker-setup.sh @@ -350,3 +350,4 @@ install_tacker echo "$0: Prepare Tacker test network environment" setup_test_environment +cd /tmp/tacker diff --git a/tests/vHello.sh b/tests/vHello.sh index f8453b0..c3c92a5 100644 --- a/tests/vHello.sh +++ b/tests/vHello.sh @@ -204,7 +204,7 @@ if [[ "$2" == "setup" ]]; then echo "$0: cloudify-setup part 2" CONTAINER=$(sudo docker ps -l | awk "/cloudify/ { print \$1 }") - sudo docker exec $CONTAINER /tmp/cloudify/cloudify-setup.sh $1 setup + sudo docker exec $CONTAINER /bin/bash /tmp/cloudify/cloudify-setup.sh $1 setup if [ $? -eq 1 ]; then fail; fi pass else @@ -215,7 +215,7 @@ else else echo "$0: pass $2 command to vHello.sh in cloudify container" CONTAINER=$(sudo docker ps -a | awk "/cloudify/ { print \$1 }") - sudo docker exec $CONTAINER /tmp/cloudify/vHello.sh $1 $2 $2 + sudo docker exec $CONTAINER /bin/bash /tmp/cloudify/vHello.sh $1 $2 $2 if [ $? -eq 1 ]; then fail; fi pass fi diff --git a/tests/vHello_Tacker.sh b/tests/vHello_Tacker.sh index 1dd01ba..230a22b 100644 --- a/tests/vHello_Tacker.sh +++ b/tests/vHello_Tacker.sh @@ -169,7 +169,7 @@ if [[ "$2" == "setup" ]]; then echo "$0: tacker-setup part 2" CONTAINER=$(sudo docker ps -l | awk "/tacker/ { print \$1 }") - sudo docker exec $CONTAINER /tmp/tacker/tacker-setup.sh $1 setup + sudo docker exec $CONTAINER /bin/bash /tmp/tacker/tacker-setup.sh $1 setup echo "$0: reset blueprints folder" if [[ -d /tmp/tacker/blueprints/tosca-vnfd-hello-world-tacker ]]; then rm -rf /tmp/tacker/blueprints/tosca-vnfd-hello-world-tacker; fi diff --git a/tests/xenial-server-cloudimg-amd64-disk1.img b/tests/xenial-server-cloudimg-amd64-disk1.img Binary files differnew file mode 100644 index 0000000..153f81c --- /dev/null +++ b/tests/xenial-server-cloudimg-amd64-disk1.img |