Browse Source

Remove networking-ovn python2 jobs

Python 2 will be EOL at the end of 2019. Ussuri will no longer support
Python 2 so it's safe to remove python2 jobs and save some CI resources.

py27 unittest tox target is kept because the job is defined globally for all
projects. We can remove the py27 tox target once the job is removed.

Change-Id: I38f5a382bf54c30361ccc93d5f565b2cfdd1d621
changes/87/686987/5
Jakub Libosvar 1 month ago
parent
commit
1688d555f8

+ 1
- 1
TESTING.rst View File

@@ -412,7 +412,7 @@ To run only the unit tests::
To run only the unit tests, but using the latest code from the upstream
neutron repository instead of the pip installed version from requirements.txt::

tox -e py3-dev
tox -e dev

Many changes span across both the OVN and neutron-lib repos, and tox
will always build the test environment using the published module versions

+ 1
- 1
networking_ovn/tests/contrib/gate_hook.sh View File

@@ -11,7 +11,7 @@ NETWORKING_OVN_PATH=$GATE_DEST/networking-ovn
GATE_STACK_USER=stack

case $VENV in
"dsvm-functional"|"dsvm-functional-py27")
"dsvm-functional")
# The logic to set YUM or DNF as the package manager lives in stackrc,
# let's source it so it gets applied
source $DEVSTACK_PATH/stackrc

+ 0
- 15
playbooks/legacy/networking-ovn-dsvm-functional-py27/post.yaml View File

@@ -1,15 +0,0 @@
- hosts: primary
tasks:

- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
synchronize:
src: '{{ ansible_user_dir }}/workspace/'
dest: '{{ zuul.executor.log_root }}'
mode: pull
copy_links: true
verify_host: true
rsync_opts:
- --include=/logs/**
- --include=*/
- --exclude=*
- --prune-empty-dirs

+ 0
- 62
playbooks/legacy/networking-ovn-dsvm-functional-py27/run.yaml View File

@@ -1,62 +0,0 @@
- hosts: all
name: Autoconverted job legacy-networking-ovn-dsvm-functional-py27 from old job gate-networking-ovn-dsvm-functional-py27
tasks:

- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory

- shell:
cmd: |
set -e
set -x
cat > clonemap.yaml << EOF
clonemap:
- name: openstack/devstack-gate
dest: devstack-gate
EOF
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
https://opendev.org \
openstack/devstack-gate
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

- shell:
cmd: |
set -e
set -x
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_UNSTACK=1
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi

# Because we are testing a non standard project, add
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-ovn $PROJECTS"
export OVN_BRANCH="branch-2.12"
export OVS_BRANCH="branch-2.12"

function gate_hook {
bash -xe $BASE/new/networking-ovn/networking_ovn/tests/contrib/gate_hook.sh dsvm-functional-py27
}
export -f gate_hook

function post_test_hook {
bash -xe $BASE/new/networking-ovn/networking_ovn/tests/contrib/post_test_hook.sh dsvm-functional-py27
}
export -f post_test_hook

cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

+ 0
- 5
setup.cfg View File

@@ -13,8 +13,6 @@ 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
@@ -45,9 +43,6 @@ keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
output_file = networking_ovn/locale/networking_ovn.pot

[wheel]
universal = 1

[entry_points]
console_scripts =
neutron-ovn-db-sync-util = networking_ovn.cmd.neutron_ovn_db_sync_util:main

+ 1
- 34
tox.ini View File

@@ -4,6 +4,7 @@ envlist = py27,py37,pep8,docs
skipsdist = True

[testenv]
basepython = python3
usedevelop = True
install_command = pip install {opts} {packages}
setenv =
@@ -21,7 +22,6 @@ commands =
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY TOX_ENV_SRC_MODULES

[testenv:pep8]
basepython = python3
envdir = {toxworkdir}/shared
whitelist_externals = {[testenv:genconfig]whitelist_externals}
commands = flake8
@@ -32,11 +32,9 @@ commands = flake8
{[testenv:bandit]commands}

[testenv:venv]
basepython = python3
commands = {posargs}

[testenv:functional]
basepython = python3
setenv =
{[testenv]setenv}
OS_TEST_PATH=./networking_ovn/tests/functional
@@ -44,14 +42,6 @@ setenv =
deps = {[testenv]deps}
-r{toxinidir}/networking_ovn/tests/functional/requirements.txt

[testenv:functional-py27]
basepython = python2.7
setenv =
{[testenv]setenv}
OS_TEST_PATH=./networking_ovn/tests/functional
OS_TEST_TIMEOUT=240
deps = {[testenv]deps}

[testenv:dsvm]
# Fake job to define environment variables shared between dsvm jobs
setenv = OS_TEST_TIMEOUT=240
@@ -59,15 +49,6 @@ setenv = OS_TEST_TIMEOUT=240
commands = false

[testenv:dsvm-functional]
basepython = python3
setenv = {[testenv:functional]setenv}
{[testenv:dsvm]setenv}
deps = {[testenv:functional]deps}
commands =
{toxinidir}/tools/ostestr_compat_shim.sh {posargs}

[testenv:dsvm-functional-py27]
basepython = python2.7
setenv = {[testenv:functional]setenv}
{[testenv:dsvm]setenv}
deps = {[testenv:functional]deps}
@@ -75,7 +56,6 @@ commands =
{toxinidir}/tools/ostestr_compat_shim.sh {posargs}

[testenv:cover]
basepython = python3
envdir = {toxworkdir}/shared
setenv =
{[testenv]setenv}
@@ -88,7 +68,6 @@ commands =
coverage xml -o cover/coverage.xml

[testenv:docs]
basepython = python3
envdir = {toxworkdir}/docs
deps = -r{toxinidir}/doc/requirements.txt
commands =
@@ -97,7 +76,6 @@ commands =
sphinx-build -W -b html doc/source doc/build/html

[testenv:pdf-docs]
basepython = python3
envdir = {toxworkdir}/docs
deps = {[testenv:docs]deps}
commands =
@@ -106,12 +84,10 @@ commands =
make -C doc/build/pdf

[testenv:debug]
basepython = python3
envdir = {toxworkdir}/shared
commands = oslo_debug_helper -t networking_ovn/tests {posargs}

[testenv:genconfig]
basepython = python3
envdir = {toxworkdir}/shared
commands =
mkdir -p etc/neutron/plugins/ml2
@@ -120,7 +96,6 @@ commands =
whitelist_externals = mkdir

[testenv:releasenotes]
basepython = python3
envdir = {toxworkdir}/docs
deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
@@ -149,14 +124,12 @@ import_exceptions = networking_ovn
local-check-factory = neutron_lib.hacking.checks.factory

[testenv:lower-constraints]
basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt

[testenv:bandit]
basepython = python3
envdir = {toxworkdir}/shared
# B104: Possible binding to all interface
deps = -r{toxinidir}/test-requirements.txt
@@ -167,15 +140,9 @@ commands = bandit -r networking_ovn -x tests -n5 -s B104
# https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs
commands =
pip install -q -e "git+https://git.openstack.org/openstack/neutron#egg=neutron"

[testenv:py3-dev]
basepython = python3
commands =
{[testenv:dev]commands}
{[testenv]commands}

[testenv:pep8-dev]
basepython = python3
deps =
{[testenv]deps}
commands =

+ 0
- 10
zuul.d/legacy-networking-ovn-jobs.yaml View File

@@ -35,16 +35,6 @@
- openstack/networking-ovn
- openstack/tempest

- job:
name: networking-ovn-dsvm-functional-py27
parent: legacy-networking-ovn-dsvm-base
run: playbooks/legacy/networking-ovn-dsvm-functional-py27/run.yaml
post-run: playbooks/legacy/networking-ovn-dsvm-functional-py27/post.yaml
timeout: 7800
required-projects:
- openstack/devstack-gate
- openstack/networking-ovn

- job:
name: networking-ovn-dsvm-functional
parent: legacy-networking-ovn-dsvm-base

+ 0
- 9
zuul.d/networking-ovn-jobs.yaml View File

@@ -241,15 +241,6 @@
devstack_localrc:
OVN_BRANCH: branch-2.12

- job:
name: networking-ovn-tempest-dsvm-ovs-release-python2
description: Job testing for devstack/tempest testing networking-ovn with the latest released OVN branch
parent: networking-ovn-base
vars:
devstack_localrc:
OVN_BRANCH: branch-2.12
USE_PYTHON3: False

- job:
name: networking-ovn-tempest-dsvm-ovs-master-fedora
description: Job testing for devstack/tempest testing networking-ovn with OVN master branch and Fedora

+ 0
- 4
zuul.d/project.yaml View File

@@ -11,9 +11,7 @@
- networking-ovn-tempest-dsvm-ovs-master:
voting: false
- networking-ovn-tempest-dsvm-ovs-release
- networking-ovn-tempest-dsvm-ovs-release-python2
- networking-ovn-rally-task
- networking-ovn-dsvm-functional-py27
- networking-ovn-dsvm-functional
# TripleO jobs that deploy OVN.
# Note we don't use a project-template here, so it's easier
@@ -35,9 +33,7 @@
gate:
jobs:
- networking-ovn-tempest-dsvm-ovs-release
- networking-ovn-tempest-dsvm-ovs-release-python2
- networking-ovn-rally-task
- networking-ovn-dsvm-functional-py27
- networking-ovn-dsvm-functional
- networking-ovn-tripleo-ci-centos-7-containers-multinode
- openstack-tox-cover:

Loading…
Cancel
Save