From d23ef4fcf049958e5082830b31de1ef88a5b8792 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Date: Wed, 23 Oct 2019 14:38:34 +0300
Subject: [PATCH] CI: Remove Python 2 leftovers

Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
 .gitlab-ci.yml     |  4 ++--
 Dockerfile.testing |  3 +--
 tests/test_all.sh  | 22 ----------------------
 tox.ini            |  2 +-
 4 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100755 tests/test_all.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4fa46b..6738bcf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,8 @@ containers:patchwork-testing:
 test:
   script:
    - python3 -V
-   - python2 -V
    - npm --version
    - chromium --version
    - chromedriver --version
-   - ./tests/test_all.sh
+   - tox --recreate
+   - ./tests/test_js.sh
diff --git a/Dockerfile.testing b/Dockerfile.testing
index 125af3d..728f197 100644
--- a/Dockerfile.testing
+++ b/Dockerfile.testing
@@ -4,8 +4,7 @@ ENV CHROME_BIN /usr/bin/chromium
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get -qq update
-RUN apt-get -qq install python-virtualenv python3-virtualenv python-pip python3-pip
-
+RUN apt-get -qq install python3-virtualenv python3-pip tox
 RUN apt-get -qq install chromium chromium-driver nodejs npm
 
 RUN npm install -g jshint jasmine-core karma karma-jasmine karma-chrome-launcher
diff --git a/tests/test_all.sh b/tests/test_all.sh
deleted file mode 100755
index e3f49ac..0000000
--- a/tests/test_all.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-
-script_dir=$(cd `dirname $0`; pwd)
-root_dir=`dirname $script_dir`
-tests_dir=$root_dir/tests
-
-update_virtualenv()
-{
-    directory=$1
-    requirements=$2
-
-    [ -d "$directory" ] || virtualenv "$directory"
-    source $directory/bin/activate
-    pip install -r $requirements
-}
-
-update_virtualenv venv $tests_dir/requirements.txt
-
-tox --recreate
-$tests_dir/test_js.sh
-
-deactivate
diff --git a/tox.ini b/tox.ini
index 3ed24f7..33bcede 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py37-django111, pep8
+envlist = py37-django22, pep8
 skipsdist = True
 
 [testenv]
-- 
GitLab