teuthology: py3 for pulpito and paddles

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

diff --git a/roles/paddles/tasks/setup_paddles.yml b/roles/paddles/tasks/setup_paddles.yml
index e7a77effc1650fb58ad0ea18677bfa18ce61e41a..b3da7c819bf2b7d03a589f74e80975f604c0bab3 100644 (file)
--- a/roles/paddles/tasks/setup_paddles.yml
+++ b/roles/paddles/tasks/setup_paddles.yml
@@ -13,6 +13,7 @@
     name: "pip"
     state: "latest"
     chdir: "{{ paddles_repo_path }}"
+    virtualenv_python: "python3"
     virtualenv: "{{ paddles_repo_path }}/virtualenv"
   become_user: "{{ paddles_user }}"
 - name: Install requirements via pip

diff --git a/roles/paddles/vars/apt_systems.yml b/roles/paddles/vars/apt_systems.yml
index 191524cc7a8be842680619fc1e4bdd9435fa8d2d..02b8a0f1107474abd6df7e141014dea05049d75d 100644 (file)
--- a/roles/paddles/vars/apt_systems.yml
+++ b/roles/paddles/vars/apt_systems.yml
@@ -1,12 +1,13 @@
 ---
 paddles_extra_packages:
   # The following is a requirement of ansible's postgresql module
-  - python-psycopg2
+  - python3-psycopg2
   # The following packages are requirements for running paddles
   - git-all
-  - python-dev
-  - python-pip
-  - python-virtualenv
+  - python3-dev
+  - python3-pip
+  - python3-virtualenv
+  - virtualenv
   - postgresql
   - postgresql-contrib
   - postgresql-server-dev-all

diff --git a/roles/paddles/vars/zypper_systems.yml b/roles/paddles/vars/zypper_systems.yml
index a818bb33b7d379bedf267ba465f62d0368f5c8ba..ee913f27ee3f1bdcc3c645dedc0d3da182a9060b 100644 (file)
--- a/roles/paddles/vars/zypper_systems.yml
+++ b/roles/paddles/vars/zypper_systems.yml
@@ -5,9 +5,9 @@ paddles_extra_packages:
   # The following packages are requirements for running paddles
   - gcc
   - git
-  - python-devel
-  - python-pip
-  - python-virtualenv
+  - python3-devel
+  - python3-pip
+  - python3-virtualenv
   - postgresql
   - postgresql-contrib
   - postgresql-devel

diff --git a/roles/pulpito/tasks/setup_pulpito.yml b/roles/pulpito/tasks/setup_pulpito.yml
index 7c1ce94a26eba7c24716c8972a79128ad50c1e6a..84b740fbe1a5006c3adfe08dfdacacb2acf7c8a6 100644 (file)
--- a/roles/pulpito/tasks/setup_pulpito.yml
+++ b/roles/pulpito/tasks/setup_pulpito.yml
@@ -16,7 +16,7 @@
   register: virtualenv
 
 - name: Create the virtualenv
-  shell: virtualenv ./virtualenv chdir={{ pulpito_repo_path }}
+  shell: virtualenv -p python3 ./virtualenv chdir={{ pulpito_repo_path }}
   become_user: "{{ pulpito_user }}"
   when: virtualenv.stat.exists == false
 

diff --git a/roles/pulpito/vars/apt_systems.yml b/roles/pulpito/vars/apt_systems.yml
index 00a6a1502f4e184861cb577c746c11dec2424904..07dc0bfd1f250abad8ad1ab6d159a4a3dc1d0323 100644 (file)
--- a/roles/pulpito/vars/apt_systems.yml
+++ b/roles/pulpito/vars/apt_systems.yml
@@ -2,8 +2,9 @@
 pulpito_extra_packages:
   - git-core
   - supervisor
-  - python-pip
-  - python-virtualenv
+  - python3-pip
+  - python3-virtualenv
+  - virtualenv
 
 supervisor_service: supervisor
 supervisor_conf_d: /etc/supervisor/conf.d/

diff --git a/roles/pulpito/vars/yum_systems.yml b/roles/pulpito/vars/yum_systems.yml
index 1a9678d327c891da848a4d17e28132482b264931..a420d29f939036e632aba5beda9d341852e7d94a 100644 (file)
--- a/roles/pulpito/vars/yum_systems.yml
+++ b/roles/pulpito/vars/yum_systems.yml
@@ -2,8 +2,8 @@
 pulpito_extra_packages:
   - git-all
   - supervisor
-  - python-pip
-  - python-virtualenv
+  - python3-pip
+  - python3-virtualenv
 
 supervisor_service: supervisord
 supervisor_conf_d: /etc/supervisord.d

diff --git a/roles/pulpito/vars/zypper_systems.yml b/roles/pulpito/vars/zypper_systems.yml
index 86df0552091aa6b941ba2081793d8f52a5befce3..dae6ff2f2bab196f5335d28d0782919be3cefca1 100644 (file)
--- a/roles/pulpito/vars/zypper_systems.yml
+++ b/roles/pulpito/vars/zypper_systems.yml
@@ -1,8 +1,8 @@
 ---
 pulpito_extra_packages:
   - git
-  - python-pip
-  - python-virtualenv
+  - python3-pip
+  - python3-virtualenv
   - supervisor
 
 supervisor_service: supervisord