diff --git a/defaults/main.yml b/defaults/main.yml index 9680f7ce..9a63df56 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -40,8 +40,19 @@ tempest_developer_mode: False tempest_developer_constraints: - "git+{{ tempest_git_repo }}@{{ tempest_git_install_branch }}#egg=tempest" +# TODO(odyssey4me): +# This can be simplified once all the roles are using +# python_venv_build. We can then switch to using a +# set of constraints in pip.conf inside the venv, +# perhaps prepared by giving a giving a list of +# constraints to the role. +tempest_pip_install_args: >- + {{ tempest_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }} + {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''), '') }} + {{ pip_install_options | default('') }} + # Name of the virtual env to deploy into -tempest_venv_tag: untagged +tempest_venv_tag: "{{ venv_tag | default('untagged') }}" tempest_venv_bin: "/openstack/venvs/tempest-{{ tempest_venv_tag }}/bin" # venv_download, even when true, will use the fallback method of building the # venv from scratch if the venv download fails. diff --git a/tasks/tempest_install.yml b/tasks/tempest_install.yml index 9524e0b4..ebd41fa5 100644 --- a/tasks/tempest_install.yml +++ b/tasks/tempest_install.yml @@ -13,17 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Install distro packages - package: - name: "{{ tempest_distro_packages }}" - state: "{{ tempest_package_state }}" - update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}" - cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" - register: install_packages - until: install_packages is success - retries: 5 - delay: 2 - +# TODO(odyssey4me): +# This can be simplified once all the roles are using +# python_venv_build. We can then switch to using a +# set of constraints in pip.conf inside the venv, +# perhaps prepared by giving a giving a list of +# constraints to the role. - name: Create developer mode constraint file copy: dest: "/opt/developer-pip-constraints.txt" @@ -33,91 +28,25 @@ {% endfor %} when: tempest_developer_mode | bool -- name: Retrieve checksum for venv download - uri: - url: "{{ tempest_venv_download_url | replace('tgz', 'checksum') }}" - return_content: yes - register: tempest_venv_checksum - when: tempest_venv_download | bool - -- name: Attempt venv download - get_url: - url: "{{ tempest_venv_download_url }}" - dest: "/var/cache/{{ tempest_venv_download_url | basename }}" - checksum: "sha1:{{ tempest_venv_checksum.content | trim }}" - register: tempest_get_venv - when: tempest_venv_download | bool - -- name: Remove existing venv - file: - path: "{{ tempest_venv_bin | dirname }}" - state: absent - when: tempest_get_venv is changed - -- name: Create tempest venv dir - file: - path: "{{ tempest_venv_bin | dirname }}" - state: directory - mode: "0755" - register: tempest_venv_dir - when: tempest_get_venv is changed - -- name: Unarchive pre-built venv - unarchive: - src: "/var/cache/{{ tempest_venv_download_url | basename }}" - dest: "{{ tempest_venv_bin | dirname }}" - copy: "no" - when: tempest_get_venv is changed - -- name: Create the virtualenv (if it does not exist) - command: "virtualenv --never-download --no-site-packages {{ tempest_venv_bin | dirname }}" - args: - creates: "{{ tempest_venv_bin }}/activate" - when: tempest_get_venv | failed or tempest_get_venv | skipped - -- name: Install pip packages - pip: - name: "{{ tempest_pip_packages }}" - state: "{{ tempest_pip_package_state }}" - virtualenv: "{{ tempest_venv_bin | dirname }}" - virtualenv_site_packages: "no" - extra_args: >- - {{ tempest_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }} - {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} - {{ pip_install_options | default('') }} - register: install_packages - until: install_packages is success - retries: 5 - delay: 2 - when: tempest_get_venv | failed or tempest_get_venv | skipped - -- name: Remove python from path first (CentOS, openSUSE) - file: - path: "{{ tempest_venv_bin | dirname }}/bin/python2.7" - state: "absent" +- name: Ensure remote wheel building is disabled in developer mode + set_fact: + venv_build_host: "{{ ansible_hostname }}" when: - - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - - tempest_get_venv is changed + - tempest_developer_mode | bool -# NOTE(odyssey4me): -# We reinitialize the venv to ensure that the right -# version of python is in the venv, but we do not -# want virtualenv to also replace pip, setuptools -# and wheel so we tell it not to. -# We do not use --always-copy for CentOS/SuSE due -# to https://github.com/pypa/virtualenv/issues/565 -- name: Reset virtualenv and update its paths - shell: | - find {{ tempest_venv_bin }} -name \*.pyc -delete - sed -si '1s/^.*python.*$/#!{{ tempest_venv_bin | replace ('/','\/') }}\/python/' {{ tempest_venv_bin }}/* - virtualenv {{ tempest_venv_bin | dirname }} \ - {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ - --no-pip \ - --no-setuptools \ - --no-wheel - when: tempest_get_venv is changed - tags: - - skip_ansible_lint +- name: Install the python venv + include_role: + name: "python_venv_build" + private: yes + vars: + venv_install_destination_path: "{{ tempest_venv_bin | dirname }}" + venv_install_distro_package_list: "{{ tempest_distro_packages }}" + venv_pip_install_args: "{{ tempest_pip_install_args }}" + venv_pip_packages: "{{ tempest_pip_packages }}" + venv_facts_when_changed: + - section: "tempest" + option: "venv_tag" + value: "{{ tempest_venv_tag }}" - name: Get tempest plugins from git git: @@ -195,10 +124,3 @@ until: install_tempest_plugins_packages is success retries: 5 delay: 2 - -- name: Record the venv tag deployed - ini_file: - dest: "/etc/ansible/facts.d/openstack_ansible.fact" - section: tempest - option: venv_tag - value: "{{ tempest_venv_tag }}"