From b6371a2009c58b2475a90cf121d4078ed459606a Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Thu, 12 May 2016 07:29:56 +0100
Subject: [PATCH] Update tempest test vars

This commit does the following:

- removes tempest_git_repo since this is the default in the tempest
  role
- removes tempest_git_dest since this variable is no longer used in
  os_tempest
- adds tempest_venv_tag variable so tempest venv is created in
  /opt/tempest_master instead of /opt/tempest_untagged
- updates tests/test-nova-functional.yml to use {{ tempest_venv_bin }}

NOTE: We also remove the local connection from
test-prepare-containers.yml as we were seeing unexpected behaviour with
this in place (such as the host getting a container's hostname, etc.)

Change-Id: Ifa8de2c962f0bc9c1e6351eac667d4ca95a73757
---
 tests/test-nova-functional.yml    | 4 ++--
 tests/test-prepare-containers.yml | 1 -
 tests/test-vars.yml               | 8 +++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/test-nova-functional.yml b/tests/test-nova-functional.yml
index f16bf83a..9a6711d5 100644
--- a/tests/test-nova-functional.yml
+++ b/tests/test-nova-functional.yml
@@ -20,8 +20,8 @@
   tasks:
     - name: Run tempest
       shell: |
-        . /opt/tempest_{{ tempest_git_install_branch }}/bin/activate
-        /opt/tempest_{{ tempest_git_install_branch }}/run_tempest.sh --no-virtual-env ${RUN_TEMPEST_OPTS} tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
+        . {{ tempest_venv_bin }}/activate
+        {{ tempest_venv_bin | dirname }}/run_tempest.sh --no-virtual-env ${RUN_TEMPEST_OPTS} tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
       environment:
         RUN_TEMPEST_OPTS: "--serial"
   vars_files:
diff --git a/tests/test-prepare-containers.yml b/tests/test-prepare-containers.yml
index cf46e8ab..c0d539ea 100644
--- a/tests/test-prepare-containers.yml
+++ b/tests/test-prepare-containers.yml
@@ -15,7 +15,6 @@
 
 - name: Playbook for creating containers
   hosts: all_containers
-  connection: local
   gather_facts: false
   roles:
     - role: "lxc_container_create"
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index 61079944..20500c0e 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -111,9 +111,11 @@ rabbitmq_port: 5671
 rabbitmq_servers: 10.100.100.101
 rabbitmq_use_ssl: true
 tempest_developer_mode: True
-tempest_git_repo: https://git.openstack.org/openstack/tempest
-tempest_git_install_branch: 534a8dc60dfef116156b8f9ee60071a9bf4e4f90
-tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
+tempest_git_install_branch: master
+tempest_venv_tag: "{{ tempest_git_install_branch }}"
+# tempest_venv_bin is the same as the default in os_tempest role, but we set
+# it again here so we can refer to it in test-nova-functional.yml
+tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
 tempest_log_dir: "/var/log/"
 tempest_main_group: glance_all
 tempest_service_available_aodh: False