Revert "[ussuri][goal] Drop python 2.7 support and testing"

This reverts commit 2f5d0300cc.

Change-Id: I015cb1969c6024a374f2a54a5df47a853dc000bc

.zuul.yaml

@@ -1,18 +1,31 @@
 - project:
     templates:
+      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
       jobs:
+        - storlets-functional:
+            irrelevant-files:
+              - ^(api-ref|doc|releasenotes)/.*$
+              - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
         - storlets-functional-py3:
             irrelevant-files:
               - ^(api-ref|doc|releasenotes)/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
     gate:
       jobs:
+        - storlets-functional
         - storlets-functional-py3
 
+- job:
+    name: storlets-functional
+    pre-run: playbooks/storlets-functional/pre.yaml
+    run: playbooks/storlets-functional/run.yaml
+    post-run: playbooks/storlets-functional/post.yaml
+    timeout: 2400
+
 - job:
     name: storlets-functional-py3
     pre-run: playbooks/storlets-functional/pre-py3.yaml

playbooks/storlets-functional/run.yaml

@@ -4,3 +4,5 @@
     - tox
   vars:
     - tox_envlist: func
+  environment:
+    USE_PYTHON3: "False"

setup.cfg

@@ -13,6 +13,8 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7

test-requirements.txt

@@ -9,7 +9,8 @@ coverage>=3.6
 nose
 pexpect
 python-subunit>=0.0.18
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
 openstackdocstheme>=1.11.0 # Apache-2.0
 oslotest>=1.2.0  # Apache-2.0
 stestr>=2.0.0 # Apache-2.0

tox.ini

@@ -1,11 +1,9 @@
 [tox]
-minversion = 3.1.1
-envlist = py37,pep8
+minversion = 2.0
+envlist = py27,py37,pep8
 skipsdist = True
-ignore_basepython_conflict = True
 
 [testenv]
-basepython = python3
 usedevelop = True
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -U {opts} {packages}
 setenv =
@@ -26,6 +24,7 @@ whitelist_externals = bash
                       rm
 
 [testenv:pep8python]
+basepython = python3
 commands =
   flake8
   flake8 --filename=* bin --exclude=bin/*.sh
@@ -39,7 +38,8 @@ commands =
 basepython = python3.7
 commands = {[testenv:py36]commands}
 
-[testenv:func-py3]
+[testenv:func]
+basepython = python2.7
 deps =
   -r{toxinidir}/test-requirements.txt
   git+git://github.com/openstack/swift.git
@@ -50,10 +50,23 @@ setenv =
 commands = {toxinidir}/.functests jenkins
 passenv = USE_PYTHON3
 
+[testenv:func-py3]
+basepython = python3
+deps =
+  -r{toxinidir}/test-requirements.txt
+  git+git://github.com/openstack/swift.git
+setenv =
+   VIRTUAL_ENV={envdir}
+   STORLET_SAMPLE_PATH={toxinidir}/StorletSamples
+   CLUSTER_CONF_DIR={toxinidir}
+commands = {[testenv:func]commands}
+
 [testenv:venv]
+basepython = python3
 commands = {posargs}
 
 [testenv:cover]
+basepython = python3
 setenv =
    {[testenv]setenv}
    PYTHON=coverage run --source storlets --parallel-mode
@@ -64,13 +77,16 @@ commands =
    coverage xml -o cover/coverage.xml
 
 [testenv:docs]
+basepython = python3
 commands =
   sphinx-build -a -W -E -b html doc/source doc/build/html
 
 [testenv:debug]
+basepython = python3
 commands = oslo_debug_helper {posargs}
 
 [testenv:bashate]
+basepython = python3
 # Run bashate check for all bash scripts
 # Ignores the following rules:
 #   E003: Indent not multiple of 4 (we prefer to use multiples of 2)
@@ -96,6 +112,7 @@ builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 
 [testenv:pep8]
+basepython = python3
 commands =
   {[testenv:pep8python]commands}
   {[testenv:bashate]commands}
@@ -103,4 +120,5 @@ passenv =
   HOME
 
 [testenv:releasenotes]
+basepython = python3
 commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html