From 16f9f3f9a7e8b6faeffd53556cb59aec71e42a5f Mon Sep 17 00:00:00 2001 From: spisarski Date: Thu, 3 Nov 2016 11:09:47 -0600 Subject: Fixed smoke tests that broke during a refactor of the snaps-provisioning project. Change-Id: I8a7ee68690156fd12f36baaf72774e2eb711312c Signed-off-by: spisarski --- ci/run_smoke_tests.sh | 3 +++ tests/smoke_tests/execute_smoke_tests.sh | 5 +---- tests/smoke_tests/execute_tests.yml | 4 +++- tests/smoke_tests/prepare_undercloud.yml | 17 +++++------------ 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/ci/run_smoke_tests.sh b/ci/run_smoke_tests.sh index b0599527..8985ed86 100755 --- a/ci/run_smoke_tests.sh +++ b/ci/run_smoke_tests.sh @@ -2,4 +2,7 @@ source ../lib/utility-functions.sh +export ANSIBLE_HOST_KEY_CHECKING=False + +echo 'See ~stack/smoke-tests.out on the undercloud for result log' ansible-playbook -i "$(get_undercloud_ip)," ../tests/smoke_tests/smoke_tests.yml diff --git a/tests/smoke_tests/execute_smoke_tests.sh b/tests/smoke_tests/execute_smoke_tests.sh index 6f9e17f3..5ebbf3a4 100755 --- a/tests/smoke_tests/execute_smoke_tests.sh +++ b/tests/smoke_tests/execute_smoke_tests.sh @@ -1,6 +1,3 @@ #!/usr/bin/env bash -cd ~/provisioning/python -export PYTHONPATH=$PYTHONPATH:$(pwd) - -python unit_test_suite.py -e ~stack/overcloudrc -n external -l INFO \ No newline at end of file +python ~/snaps/snaps/unit_test_suite.py -e ~stack/overcloudrc -n external -l INFO &> ~stack/snoke-tests.out \ No newline at end of file diff --git a/tests/smoke_tests/execute_tests.yml b/tests/smoke_tests/execute_tests.yml index e2326560..5042d230 100644 --- a/tests/smoke_tests/execute_tests.yml +++ b/tests/smoke_tests/execute_tests.yml @@ -1,6 +1,8 @@ --- - hosts: all - sudo: yes + become: yes + become_method: sudo + become_user: root tasks: - name: Copy execute_smoke_tests.sh diff --git a/tests/smoke_tests/prepare_undercloud.yml b/tests/smoke_tests/prepare_undercloud.yml index d4e318a9..69343ffa 100644 --- a/tests/smoke_tests/prepare_undercloud.yml +++ b/tests/smoke_tests/prepare_undercloud.yml @@ -1,16 +1,9 @@ --- - hosts: all - sudo: yes + become: yes + become_method: sudo + become_user: root tasks: - - yum: name=libffi - - yum: name=libffi-devel - - pip: name=python-keystoneclient - - pip: name=python-glanceclient - - pip: name=python-neutronclient - - pip: name=python-novaclient - - pip: name=scp - - pip: name=PyYAML - - pip: name=ansible==2.1.0 - - - git: repo=https://gerrit.cablelabs.com/snaps-provisioning dest=~/provisioning + - git: repo=https://gerrit.cablelabs.com/snaps-provisioning dest=~/snaps + - command: pip install -e ~/snaps/ -- cgit 1.2.3-korg