From ccca64f523027b11d81ef10c38c0b03f739b8a29 Mon Sep 17 00:00:00 2001
From: Quique Llorente <ellorent@redhat.com>
Date: Mon, 19 Nov 2018 11:07:36 +0100
Subject: [PATCH] Install correct python version packages at tempest

The role validate-tempest was installing python- for f28 we need to
install python3 packages.

used/needed by https://review.openstack.org/618056

Story: https://tree.taiga.io/project/tripleo-ci-board/task/375

Change-Id: Iad3dde61173140321ede8f3549e01163cb4f4b41
---
 roles/validate-tempest/defaults/main.yml         |  2 ++
 roles/validate-tempest/tasks/main.yml            | 15 +++++++--------
 roles/validate-tempest/tasks/pre-tempest.yml     |  6 +++---
 roles/validate-tempest/tasks/tempest-results.yml |  2 +-
 roles/validate-tempest/tasks/tempest-rpm.yml     | 14 ++++++--------
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/roles/validate-tempest/defaults/main.yml b/roles/validate-tempest/defaults/main.yml
index 86efd82cf..0dbafcb27 100644
--- a/roles/validate-tempest/defaults/main.yml
+++ b/roles/validate-tempest/defaults/main.yml
@@ -100,6 +100,8 @@ tempest_conf_removal_queens:
 tempest_os_cloud: ""
 stackviz_tarball: "https://tarballs.openstack.org/package-stackviz-element/stackviz-latest.tar.gz"
 
+python_package_prefix: "python"
+
 # Headless Chrome configuration
 tempest_use_headless_chrome: false
 tempest_headless_chrome_port: 9999
diff --git a/roles/validate-tempest/tasks/main.yml b/roles/validate-tempest/tasks/main.yml
index 0d44be95d..793e6661b 100644
--- a/roles/validate-tempest/tasks/main.yml
+++ b/roles/validate-tempest/tasks/main.yml
@@ -3,22 +3,21 @@
   setup:
     gather_subset: "!min,python,processor"
   when: >
-    python_version is not defined or
+    ansible_python is not defined or
     ansible_processor_vcpus is not defined
 
-- name: gather ansible_python_version
-  setup:
-    gather_subset: "!min,python_version,python"
-  when: >
-    ansible_python_version is not defined or
-    ansible_python is not defined
-
 - name: set python_cmd
   set_fact:
     python_cmd: "python{{ ansible_python.version.major }}"
     cacheable: true
   when: python_cmd is not defined
 
+- name: change python_package_prefix for python > 2
+  set_fact:
+    python_package_prefix: "python{{ ansible_python.version.major }}"
+    cacheable: true
+  when: ansible_python.version.major > 2
+
 - include: tempest-venv.yml
   when: tempest_config|bool and tempest_format == 'venv'
   tags:
diff --git a/roles/validate-tempest/tasks/pre-tempest.yml b/roles/validate-tempest/tasks/pre-tempest.yml
index 38b0a3547..4e7a0e0f1 100644
--- a/roles/validate-tempest/tasks/pre-tempest.yml
+++ b/roles/validate-tempest/tasks/pre-tempest.yml
@@ -47,16 +47,16 @@
   become: true
   package:
     name:
-      - python-subunit
+      - "{{python_package_prefix}}-os-testr"
+      - "{{python_package_prefix}}-subunit"
       - subunit-filters
-      - python-os-testr
     state: present
   when: tempest_format in ['container', 'packages']
 
 - name: Install stestr
   become: true
   package:
-    name: python-stestr
+    name: "{{python_package_prefix}}-stestr"
     state: present
   when: tempest_format in ['container', 'packages'] and release not in ['newton', 'ocata']
 
diff --git a/roles/validate-tempest/tasks/tempest-results.yml b/roles/validate-tempest/tasks/tempest-results.yml
index 5638aa72f..f6d7202a9 100644
--- a/roles/validate-tempest/tasks/tempest-results.yml
+++ b/roles/validate-tempest/tasks/tempest-results.yml
@@ -8,7 +8,7 @@
 
     - name: Define testr facts
       set_fact:
-        testr_command: "{{ testr_dir.stat.exists | ternary('stestr', 'testr') }}"
+        testr_command: "{{ testr_dir.stat.exists | ternary(python_cmd + ' -m stestr.cli', 'testr') }}"
 
     - name: Change permission of tempest container log directory
       shell: |
diff --git a/roles/validate-tempest/tasks/tempest-rpm.yml b/roles/validate-tempest/tasks/tempest-rpm.yml
index cc236f7c2..20484e524 100644
--- a/roles/validate-tempest/tasks/tempest-rpm.yml
+++ b/roles/validate-tempest/tasks/tempest-rpm.yml
@@ -1,5 +1,5 @@
 ---
-- name: Install openstack services tempest plugin
+- name: Install openstack services tempest plugin for newton
   package:
     name:
       - python-ceilometer-tests
@@ -15,29 +15,27 @@
       - python-cinder-tests
     state: present
   become: true
-
   when: release == 'newton'
 
 - name: Install openstack services tempest plugins
   package:
     state: latest
-    name: "{{ item }}"
+    name: "{{ item | regex_replace( '^python[0-9]*-(.*)$', python_package_prefix + '-\\1' ) }}"
   with_items: "{{ tempest_plugins }}"
   become: true
   when: tempest_plugins|length > 0
 
 - name: Install openstack tempest
   package:
-    name: "{{ item }}"
+    name:
+      - openstack-tempest
+      - "{{ python_package_prefix }}-junitxml"
     state: present
   become: true
-  with_items:
-    - openstack-tempest
-    - python-junitxml
 
 - name: Install python-tempestconf
   package:
-    name: python-tempestconf
+    name: "{{ python_package_prefix }}-tempestconf"
     state: present
   become: true
   when: release != 'newton'