From c94e35654d975b1bfd3b7d601f8452109098d17e Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Thu, 12 May 2016 08:06:06 +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
- updates tempest_git_install_branch to point at master rather than an
  old SHA
- 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-horizon-functional.yml to use
  {{ tempest_venv_bin }}

Change-Id: I2f5845e77f681e0674e5e05f8e0d847cbf6384e7
---
 tests/test-cinder-functional.yml | 4 ++--
 tests/test-vars.yml              | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/test-cinder-functional.yml b/tests/test-cinder-functional.yml
index 41afeacd..af7a8c64 100644
--- a/tests/test-cinder-functional.yml
+++ b/tests/test-cinder-functional.yml
@@ -24,8 +24,8 @@
         status_code: 200,300
     - 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.api.volume.test_volumes_get
+        . {{ tempest_venv_bin }}/activate
+        {{ tempest_venv_bin | dirname }}/run_tempest.sh --no-virtual-env ${RUN_TEMPEST_OPTS} tempest.api.volume.test_volumes_get
       environment:
         RUN_TEMPEST_OPTS: "--serial"
   vars_files:
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index a5df46fe..acaca3b2 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -53,9 +53,11 @@ rabbitmq_port: 5671
 rabbitmq_servers: 10.100.100.2
 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-cinder-functional.yml
+tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
 tempest_log_dir: "/var/log/"
 tempest_main_group: cinder_all
 tempest_service_available_aodh: False