diff --git a/defaults/main.yml b/defaults/main.yml index 87c6eafc..8d568f35 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -67,7 +67,6 @@ tempest_log_dir: "/var/log/tempest" # - name: designate-tempest-plugin #name of the plugin # repo: https://git.openstack.org/openstack/designate-tempest-plugin #for installing the plugin from sources # branch: master #for installing the plugin from sources -# install_test_requirements: True #for installing the plugin with its test_requirements (default: True) # - name: ironic-tempest-plugin # package: ironic #for installing the plugin from packages tempest_plugins: "{{ _tempest_plugins.values() | sum(start=[]) | selectattr('install', 'equalto', true) | list }}" diff --git a/tasks/tempest_install_source.yml b/tasks/tempest_install_source.yml index e1ab4b66..2c075f14 100644 --- a/tasks/tempest_install_source.yml +++ b/tasks/tempest_install_source.yml @@ -39,32 +39,6 @@ retries: 5 delay: 2 -- name: Check for the existance of the test-requirements.txt file - stat: - path: "/opt/{{ item.name|replace('-', '_') }}_{{ item.branch|replace('/', '_') }}/test-requirements.txt" - with_items: "{{ tempest_plugins }}" - when: item.repo is defined - register: _test_requirements_stat - -- name: Install tempest plugin requirements - pip: - requirements: "{{ item.stat.path }}" - state: "{{ tempest_pip_package_state }}" - virtualenv: "{{ tempest_venv_bin | dirname }}" - virtualenv_site_packages: "no" - extra_args: >- - {{ pip_install_options | default('') }} - --isolated - with_items: "{{ _test_requirements_stat.results }}" - when: - - "item.item.repo is defined" - - "item.stat.exists" - - "(item.item.install_test_requirements | default(True)) | bool" - register: install_tempest_plugin_requirements - until: install_tempest_plugin_requirements is success - retries: 5 - delay: 2 - - name: Install tempest plugins from cloned repo pip: name: "/opt/{{ item.name|replace('-', '_') }}_{{ item.branch|replace('/', '_') }}" diff --git a/vars/main.yml b/vars/main.yml index 7776b0e2..cc4931f3 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -17,7 +17,6 @@ # - name: # repo: # when installing from a repo # branch: # when installing from a repo -# install_test_requirements: # when installing from a repo # package: # when installing from a pip package # install: # boolean to enable/disable the installation of this item @@ -41,7 +40,6 @@ _tempest_plugins: - name: congress-tempest-plugin repo: https://git.openstack.org/openstack/congress-tempest-plugin branch: master - install_test_requirements: false install: "{{ tempest_service_available_congress | bool }}" designate: - name: designate-tempest-plugin