Merge "roles: use virtualenv_command instead of virtualenv_python" into feature/1.0

.zuul.d/zuul.yaml

@@ -19,6 +19,7 @@
       ara_tests_cleanup: false
       integration_ansible_name: "{{ ansible_user_dir }}/src/github.com/ansible/ansible"
       integration_ansible_version: null
+    pre-run: tests/role-integration-pre.yaml
     run: playbooks/ara_tests.yaml
     post-run: tests/ara_tests_post.yaml
 

roles/ara_api/tasks/database_engine/django.db.backends.postgresql.yaml

@@ -40,7 +40,7 @@
     name: psycopg2
     state: present
     virtualenv: "{{ ara_api_venv | bool | ternary(ara_api_venv_path, omit) }}"
-    virtualenv_python: python3
+    virtualenv_command: /usr/bin/python3 -m venv
 
 - name: Run SQL migrations
   environment:

roles/ara_api/tasks/install/source.yaml

@@ -27,7 +27,7 @@
     name: "{{ ara_api_source_checkout }}[server]"
     state: present
     virtualenv: "{{ ara_api_venv | bool | ternary(ara_api_venv_path, omit) }}"
-    virtualenv_python: python3
+    virtualenv_command: /usr/bin/python3 -m venv
 
 - name: Prefix the virtualenv bin directory to PATH
   set_fact:

roles/ara_api/tasks/wsgi_server/gunicorn.yaml

@@ -21,7 +21,7 @@
     name: gunicorn
     state: present
     virtualenv: "{{ ara_api_venv | bool | ternary(ara_api_venv_path, omit) }}"
-    virtualenv_python: python3
+    virtualenv_command: /usr/bin/python3 -m venv
 
 - become: yes
   block:

roles/ara_tests/tasks/main.yaml

@@ -31,6 +31,13 @@
     _ara_tests_repository: "{{ lookup('pipe', 'git rev-parse --show-toplevel') }}"
   when: zuul is not defined
 
+- name: Ensure python3-venv is installed for Ubuntu
+  become: yes
+  package:
+    name: python3-venv
+    state: present
+  when: ansible_distribution == "Ubuntu"
+
 # If a version is not explicitly set we want to make sure to
 # completely omit the version argument to pip, as it will be coming
 # from the long-form integration_ansible_name variable.  Additionally, if
@@ -52,14 +59,14 @@
     version: "{{ _install_ansible_version | default(omit, True) }}"
     state: "{{ _install_ansible_state | default(omit, True) }}"
     virtualenv: "{{ ara_tests_virtualenv }}"
-    virtualenv_python: python3
+    virtualenv_command: /usr/bin/python3 -m venv
 
 - name: Install ARA from source in virtual environment
   pip:
     name: "{{ _ara_tests_repository }}[server]"
     state: present
     virtualenv: "{{ ara_tests_virtualenv }}"
-    virtualenv_python: python3
+    virtualenv_command: /usr/bin/python3 -m venv
 
 - name: Get ARA plugins directory
   command: "{{ ara_tests_virtualenv }}/bin/python -m ara.setup.plugins"

tests/test_tasks.yaml

@@ -45,7 +45,7 @@
     version: "{{ _install_ansible_version | default(omit, True) }}"
     state: "{{ _install_ansible_state | default(omit, True) }}"
     virtualenv: "{{ ara_api_venv | bool | ternary(ara_api_venv_path, omit) }}"
-    virtualenv_python: python3
+    virtualenv_command: /usr/bin/python3 -m venv
 
 - name: Get ARA plugins directory
   environment: