diff options
| author |   blsaws <bryan.sullivan@att.com> | 2016-09-06 16:11:59 -0700 |
|---|---|---|
| committer | blsaws <bryan.sullivan@att.com> | 2016-09-06 16:11:59 -0700 |
| commit | 70019f0c67b127e22ff17287c5fb2fa57d5c9bc0 (patch) | |
| tree | 2ddb81a589c404e702800653ee11b03e53da32bb /tests/vHello.sh | |
| parent | 134ed14ddcda97ff8ac7ff2d473d405b6d31f407 (diff) | |
Updates in further testing
JIRA: MODELS-23
Change-Id: I55418cc967fdf5e59d60304d2513dbe1e80b7dcc
Signed-off-by: blsaws <bryan.sullivan@att.com>
Diffstat (limited to 'tests/vHello.sh')
| -rw-r--r-- | tests/vHello.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/vHello.sh b/tests/vHello.sh index b315e0c..f8453b0 100644 --- a/tests/vHello.sh +++ b/tests/vHello.sh @@ -76,7 +76,6 @@ start() { else git clone https://github.com/blsaws/cloudify-cli-hello-world-example.git cd cloudify-cli-hello-world-example - git checkout 3.4.1-build fi cd /tmp/cloudify/blueprints @@ -128,9 +127,6 @@ ssh_port: 22 EOF fi - echo "$0: activate cloudify Virtualenv" - source ~/cloudify/venv/bin/activate - echo "$0: initialize cloudify environment" cd /tmp/cloudify/blueprints cfy init -r @@ -204,11 +200,11 @@ if [[ "$2" == "setup" ]]; then chmod 755 /tmp/cloudify/*.sh echo "$0: cloudify-setup part 1" - bash utils/cloudify-setup.sh $1 1 + bash utils/cloudify-setup.sh $1 init echo "$0: cloudify-setup part 2" - CONTAINER=$(sudo docker ps -l | awk "/ ubuntu:xenial / { print \$1 }") - sudo docker exec $CONTAINER /tmp/cloudify/cloudify-setup.sh $1 2 + CONTAINER=$(sudo docker ps -l | awk "/cloudify/ { print \$1 }") + sudo docker exec $CONTAINER /tmp/cloudify/cloudify-setup.sh $1 setup if [ $? -eq 1 ]; then fail; fi pass else @@ -218,7 +214,7 @@ else if [[ "$3" == "clean" ]]; then clean $1; fi else echo "$0: pass $2 command to vHello.sh in cloudify container" - CONTAINER=$(sudo docker ps -l | awk "/ ubuntu:xenial / { print \$1 }") + CONTAINER=$(sudo docker ps -a | awk "/cloudify/ { print \$1 }") sudo docker exec $CONTAINER /tmp/cloudify/vHello.sh $1 $2 $2 if [ $? -eq 1 ]; then fail; fi pass |