From 5985479ecfa3838b190163f5b1403322a5601432 Mon Sep 17 00:00:00 2001 From: Amol Kahat Date: Thu, 18 Jun 2020 15:44:55 +0530 Subject: [PATCH] Added virtualenv and tox installation python-tempestconf-tempest-devstack-* jobs were failing due to missing virtualenv and tox. Added 'ensure-tox' role in packstack and devstack deployment playbook. To make sure that tox is installed and it will not break the tempest tests run. Change-Id: I554eb41b2e070d86c3d9f6e807a973f70d6b5f83 Signed-off-by: Amol Kahat --- playbooks/python-tempestconf-tempest-devstack.yaml | 12 ++++++++++++ playbooks/python-tempestconf-tempest-packstack.yaml | 12 ++++++++++++ roles/generate-accounts-file/tasks/main.yaml | 4 ++++ .../generate-tempestconf-file-cloud/tasks/main.yaml | 4 ++++ roles/generate-tempestconf-file/tasks/main.yaml | 4 ++++ roles/install-plugins/tasks/main.yaml | 4 ++++ 6 files changed, 40 insertions(+) diff --git a/playbooks/python-tempestconf-tempest-devstack.yaml b/playbooks/python-tempestconf-tempest-devstack.yaml index c66ae698..6e16ddb3 100644 --- a/playbooks/python-tempestconf-tempest-devstack.yaml +++ b/playbooks/python-tempestconf-tempest-devstack.yaml @@ -23,6 +23,17 @@ - name: Setup Tempest Data Directory include_role: name: setup-tempest-data-dir + + # NOTE: devstack jobs are failing on Run Tempest task + # it is because tox command is not found. Adding 'ensure-tox' + # role here to make sure that tox is installed and it + # will not break the tempest tests. + - name: Ensure tox is installed + include_role: + name: ensure-tox + vars: + ensure_global_symlinks: True + - name: ACL devstack files include_role: name: acl-devstack-files @@ -38,6 +49,7 @@ - name: Generate tempest configuration file based on cloud credentials include_role: name: generate-tempestconf-file-cloud + # run-tempest role is inherited from openstack/tempest project - name: Run Tempest Tests include_role: diff --git a/playbooks/python-tempestconf-tempest-packstack.yaml b/playbooks/python-tempestconf-tempest-packstack.yaml index c4213bf7..3895aeba 100644 --- a/playbooks/python-tempestconf-tempest-packstack.yaml +++ b/playbooks/python-tempestconf-tempest-packstack.yaml @@ -23,12 +23,24 @@ name: setup-devstack-source-dirs # setup-tempest-* and acl-devstack-files roles are inherited from # openstack/tempest project + - name: Setup Tempest Run Directory include_role: name: setup-tempest-run-dir - name: Setup Tempest Data Directory include_role: name: setup-tempest-data-dir + + # NOTE: packstack jobs are failing on Run Tempest task + # it is because tox command is not found. Adding 'ensure-tox' + # role here to make sure that tox is installed and it + # will not break the tempest tests. + - name: Ensure tox is installed + include_role: + name: ensure-tox + vars: + ensure_global_symlinks: True + - name: ACL devstack files include_role: name: acl-devstack-files diff --git a/roles/generate-accounts-file/tasks/main.yaml b/roles/generate-accounts-file/tasks/main.yaml index 26e9634b..8833dba2 100644 --- a/roles/generate-accounts-file/tasks/main.yaml +++ b/roles/generate-accounts-file/tasks/main.yaml @@ -1,4 +1,8 @@ - block: + - name: Ensure python-virtualenv is present + include_role: + name: ensure-virtualenv + - name: Create tempest venv with latest pip, setuptools and pbr pip: virtualenv: "{{ virtualenvs.tempest }}" diff --git a/roles/generate-tempestconf-file-cloud/tasks/main.yaml b/roles/generate-tempestconf-file-cloud/tasks/main.yaml index e5fa1803..2fd9d9e1 100644 --- a/roles/generate-tempestconf-file-cloud/tasks/main.yaml +++ b/roles/generate-tempestconf-file-cloud/tasks/main.yaml @@ -1,4 +1,8 @@ - block: + - name: Ensure python-virtualenv is present + include_role: + name: ensure-virtualenv + - name: Create python-tempestconf venv with latest pip, setuptools and pbr pip: virtualenv: "{{ virtualenvs.tempestconf }}" diff --git a/roles/generate-tempestconf-file/tasks/main.yaml b/roles/generate-tempestconf-file/tasks/main.yaml index 2ea6d59a..dfab89ec 100644 --- a/roles/generate-tempestconf-file/tasks/main.yaml +++ b/roles/generate-tempestconf-file/tasks/main.yaml @@ -2,6 +2,10 @@ - debug: var: source_credentials_commands + - name: Ensure python-virtualenv is present + include_role: + name: ensure-virtualenv + - name: Create python-tempestconf venv with latest pip, setuptools and pbr pip: virtualenv: "{{ virtualenvs.tempestconf }}" diff --git a/roles/install-plugins/tasks/main.yaml b/roles/install-plugins/tasks/main.yaml index 688605b8..55ba6716 100644 --- a/roles/install-plugins/tasks/main.yaml +++ b/roles/install-plugins/tasks/main.yaml @@ -1,3 +1,7 @@ +- name: Ensure tox is installed + include_role: + name: ensure-tox + - name: Prepare tempest venv become: yes command: tox -r --notest -efull