summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2016-11-03 11:09:47 -0600
committerspisarski <s.pisarski@cablelabs.com>2016-11-03 11:09:47 -0600
commit16f9f3f9a7e8b6faeffd53556cb59aec71e42a5f (patch)
tree2d2a7cc4a4488b14f91d5fd6d846027d1c44874d
parent3da4fac9065a2c3c0f2f945ab857ace4a457e7cd (diff)
Fixed smoke tests that broke during a refactor of the snaps-provisioning project.
Change-Id: I8a7ee68690156fd12f36baaf72774e2eb711312c Signed-off-by: spisarski <s.pisarski@cablelabs.com>
-rwxr-xr-xci/run_smoke_tests.sh3
-rwxr-xr-xtests/smoke_tests/execute_smoke_tests.sh5
-rw-r--r--tests/smoke_tests/execute_tests.yml4
-rw-r--r--tests/smoke_tests/prepare_undercloud.yml17
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/