From e7247dbd9a8d350e283012a0c71c945670d13ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 17 Jun 2020 17:48:32 +0200 Subject: [PATCH] CI: use venv only (and not virtualenv) It seems we used virtualenv for ceph-ansible only. Change-Id: I7f9002283462dbe4bae3c1d7ff1dedcc4e7d01f2 --- tests/deploy-ceph-ansible.sh | 2 +- tests/pre.yml | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/deploy-ceph-ansible.sh b/tests/deploy-ceph-ansible.sh index b018521f12..98914d2252 100755 --- a/tests/deploy-ceph-ansible.sh +++ b/tests/deploy-ceph-ansible.sh @@ -8,7 +8,7 @@ export PYTHONUNBUFFERED=1 function setup_ceph_ansible { # Prepare virtualenv for ceph-ansible deployment - virtualenv --system-site-packages ~/ceph-venv + python3 -m venv --system-site-packages ~/ceph-venv ~/ceph-venv/bin/pip install -Ir requirements.txt ~/ceph-venv/bin/pip install -IU selinux } diff --git a/tests/pre.yml b/tests/pre.yml index bd70eca031..83df9bc3f0 100644 --- a/tests/pre.yml +++ b/tests/pre.yml @@ -31,19 +31,9 @@ - gawk - python3-pip - python3-setuptools - - python3-virtualenv - python3-wheel become: true - # NOTE(hrw): On RedHat systems it is part of python3-virtualenv - - name: Install virtualenv on Debian systems - package: - name: - - virtualenv - become: true - when: - ansible_os_family == "Debian" - - name: Ensure /tmp/logs/ dir file: path: "{{ logs_dir }}"