[ussuri][goal] Updates for python 2.7 drop
OpenStack is dropping the py2.7 support in ussuri cycle except swift and sorlets which is exception approved in this goal. Somehow this repo is left to remove the py2.7 requirement and setup.cfg file cleanup. Ussuri Communtiy-wide goal: https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html Also drop the stable/queens|rocky py2 jobs because octavia-tempest-plugin master code cannot test them because of py2 drop. They are also Extended Maintainance state so it is ok to not test them on master. Same way Tempest and other plugins did - https://review.opendev.org/#/c/722183/ Change-Id: I9b20229a25dc9752e4a813709f0b67bbd104faa5
This commit is contained in:
parent
0956246b51
commit
a97deefcb3
|
@ -3,8 +3,7 @@
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
sphinxcontrib-apidoc>=0.2.0 # BSD
|
sphinxcontrib-apidoc>=0.2.0 # 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,>=1.6.2,!=2.1.0; # BSD
|
||||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2,!=2.1.0;python_version>='3.4' # BSD
|
|
||||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||||
|
|
||||||
# releasenotes
|
# releasenotes
|
||||||
|
|
16
setup.cfg
16
setup.cfg
|
@ -6,6 +6,7 @@ description-file =
|
||||||
author = OpenStack
|
author = OpenStack
|
||||||
author-email = openstack-discuss@lists.openstack.org
|
author-email = openstack-discuss@lists.openstack.org
|
||||||
home-page = https://docs.openstack.org/octavia-tempest-plugin/latest/
|
home-page = https://docs.openstack.org/octavia-tempest-plugin/latest/
|
||||||
|
python-requires = >=3.6
|
||||||
classifier =
|
classifier =
|
||||||
Environment :: OpenStack
|
Environment :: OpenStack
|
||||||
Intended Audience :: Information Technology
|
Intended Audience :: Information Technology
|
||||||
|
@ -13,10 +14,11 @@ classifier =
|
||||||
License :: OSI Approved :: Apache Software License
|
License :: OSI Approved :: Apache Software License
|
||||||
Operating System :: POSIX :: Linux
|
Operating System :: POSIX :: Linux
|
||||||
Programming Language :: Python
|
Programming Language :: Python
|
||||||
Programming Language :: Python :: 2
|
Programming Language :: Python :: Implementation :: CPython
|
||||||
Programming Language :: Python :: 2.7
|
Programming Language :: Python :: 3 :: Only
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3.5
|
Programming Language :: Python :: 3.6
|
||||||
|
Programming Language :: Python :: 3.7
|
||||||
|
|
||||||
[global]
|
[global]
|
||||||
setup-hooks =
|
setup-hooks =
|
||||||
|
@ -26,14 +28,6 @@ setup-hooks =
|
||||||
packages =
|
packages =
|
||||||
octavia_tempest_plugin
|
octavia_tempest_plugin
|
||||||
|
|
||||||
[build_sphinx]
|
|
||||||
source-dir = doc/source
|
|
||||||
build-dir = doc/build
|
|
||||||
all_files = 1
|
|
||||||
|
|
||||||
[upload_sphinx]
|
|
||||||
upload-dir = doc/build/html
|
|
||||||
|
|
||||||
[compile_catalog]
|
[compile_catalog]
|
||||||
directory = octavia_tempest_plugin/locale
|
directory = octavia_tempest_plugin/locale
|
||||||
domain = octavia_tempest_plugin
|
domain = octavia_tempest_plugin
|
||||||
|
|
|
@ -417,16 +417,6 @@
|
||||||
parent: octavia-v2-dsvm-noop-api
|
parent: octavia-v2-dsvm-noop-api
|
||||||
override-checkout: stable/stein
|
override-checkout: stable/stein
|
||||||
|
|
||||||
- job:
|
|
||||||
name: octavia-v2-dsvm-noop-py2-api-stable-rocky
|
|
||||||
parent: octavia-v2-dsvm-noop-py2-api
|
|
||||||
override-checkout: stable/rocky
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: octavia-v2-dsvm-noop-py2-api-stable-queens
|
|
||||||
parent: octavia-v2-dsvm-noop-py2-api
|
|
||||||
override-checkout: stable/queens
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: octavia-v2-dsvm-scenario
|
name: octavia-v2-dsvm-scenario
|
||||||
parent: octavia-dsvm-live-base
|
parent: octavia-dsvm-live-base
|
||||||
|
@ -484,16 +474,6 @@
|
||||||
parent: octavia-v2-dsvm-scenario
|
parent: octavia-v2-dsvm-scenario
|
||||||
override-checkout: stable/stein
|
override-checkout: stable/stein
|
||||||
|
|
||||||
- job:
|
|
||||||
name: octavia-v2-dsvm-py2-scenario-stable-rocky
|
|
||||||
parent: octavia-v2-dsvm-py2-scenario
|
|
||||||
override-checkout: stable/rocky
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: octavia-v2-dsvm-py2-scenario-stable-queens
|
|
||||||
parent: octavia-v2-dsvm-py2-scenario
|
|
||||||
override-checkout: stable/queens
|
|
||||||
|
|
||||||
# Legacy jobs for the transition to the act-stdby two node jobs
|
# Legacy jobs for the transition to the act-stdby two node jobs
|
||||||
- job:
|
- job:
|
||||||
name: octavia-v2-dsvm-scenario-two-node
|
name: octavia-v2-dsvm-scenario-two-node
|
||||||
|
@ -652,16 +632,6 @@
|
||||||
parent: octavia-v2-dsvm-spare-pool
|
parent: octavia-v2-dsvm-spare-pool
|
||||||
override-checkout: stable/stein
|
override-checkout: stable/stein
|
||||||
|
|
||||||
- job:
|
|
||||||
name: octavia-v2-dsvm-py2-spare-pool-stable-rocky
|
|
||||||
parent: octavia-v2-dsvm-py2-spare-pool
|
|
||||||
override-checkout: stable/rocky
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: octavia-v2-dsvm-py2-spare-pool-stable-queens
|
|
||||||
parent: octavia-v2-dsvm-py2-spare-pool
|
|
||||||
override-checkout: stable/queens
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: octavia-v2-dsvm-cinder-amphora
|
name: octavia-v2-dsvm-cinder-amphora
|
||||||
parent: octavia-v2-dsvm-scenario
|
parent: octavia-v2-dsvm-scenario
|
||||||
|
@ -770,16 +740,6 @@
|
||||||
load_balancer:
|
load_balancer:
|
||||||
amphora_ssh_user: centos
|
amphora_ssh_user: centos
|
||||||
|
|
||||||
- job:
|
|
||||||
name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky
|
|
||||||
parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
|
|
||||||
override-checkout: stable/rocky
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens
|
|
||||||
parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
|
|
||||||
override-checkout: stable/queens
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: octavia-v2-act-stdby-dsvm-scenario
|
name: octavia-v2-act-stdby-dsvm-scenario
|
||||||
parent: octavia-dsvm-live-base
|
parent: octavia-dsvm-live-base
|
||||||
|
|
|
@ -11,23 +11,15 @@
|
||||||
- octavia-v2-dsvm-noop-api
|
- octavia-v2-dsvm-noop-api
|
||||||
- octavia-v2-dsvm-noop-api-stable-train
|
- octavia-v2-dsvm-noop-api-stable-train
|
||||||
- octavia-v2-dsvm-noop-api-stable-stein
|
- octavia-v2-dsvm-noop-api-stable-stein
|
||||||
- octavia-v2-dsvm-noop-py2-api-stable-rocky
|
|
||||||
- octavia-v2-dsvm-noop-py2-api-stable-queens
|
|
||||||
- octavia-v2-dsvm-scenario
|
- octavia-v2-dsvm-scenario
|
||||||
- octavia-v2-dsvm-scenario-stable-train
|
- octavia-v2-dsvm-scenario-stable-train
|
||||||
- octavia-v2-dsvm-scenario-stable-stein
|
- octavia-v2-dsvm-scenario-stable-stein
|
||||||
- octavia-v2-dsvm-py2-scenario-stable-rocky
|
|
||||||
- octavia-v2-dsvm-py2-scenario-stable-queens
|
|
||||||
- octavia-v2-dsvm-scenario-ipv6-only:
|
- octavia-v2-dsvm-scenario-ipv6-only:
|
||||||
voting: false
|
voting: false
|
||||||
- octavia-v2-dsvm-scenario-centos-8:
|
- octavia-v2-dsvm-scenario-centos-8:
|
||||||
voting: false
|
voting: false
|
||||||
- octavia-v2-act-stdby-dsvm-scenario-two-node:
|
- octavia-v2-act-stdby-dsvm-scenario-two-node:
|
||||||
voting: false
|
voting: false
|
||||||
- octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky:
|
|
||||||
voting: false
|
|
||||||
- octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens:
|
|
||||||
voting: false
|
|
||||||
- octavia-v2-act-stdby-dsvm-scenario:
|
- octavia-v2-act-stdby-dsvm-scenario:
|
||||||
voting: false
|
voting: false
|
||||||
- octavia-v2-act-stdby-dsvm-scenario-stable-train:
|
- octavia-v2-act-stdby-dsvm-scenario-stable-train:
|
||||||
|
@ -40,20 +32,12 @@
|
||||||
voting: false
|
voting: false
|
||||||
- octavia-v2-dsvm-tls-barbican-stable-stein:
|
- octavia-v2-dsvm-tls-barbican-stable-stein:
|
||||||
voting: false
|
voting: false
|
||||||
- octavia-v2-dsvm-tls-barbican-stable-rocky:
|
|
||||||
voting: false
|
|
||||||
- octavia-v2-dsvm-tls-barbican-stable-queens:
|
|
||||||
voting: false
|
|
||||||
- octavia-v2-dsvm-spare-pool:
|
- octavia-v2-dsvm-spare-pool:
|
||||||
voting: false
|
voting: false
|
||||||
- octavia-v2-dsvm-spare-pool-stable-train:
|
- octavia-v2-dsvm-spare-pool-stable-train:
|
||||||
voting: false
|
voting: false
|
||||||
- octavia-v2-dsvm-spare-pool-stable-stein:
|
- octavia-v2-dsvm-spare-pool-stable-stein:
|
||||||
voting: false
|
voting: false
|
||||||
- octavia-v2-dsvm-py2-spare-pool-stable-rocky:
|
|
||||||
voting: false
|
|
||||||
- octavia-v2-dsvm-py2-spare-pool-stable-queens:
|
|
||||||
voting: false
|
|
||||||
- octavia-v2-dsvm-cinder-amphora:
|
- octavia-v2-dsvm-cinder-amphora:
|
||||||
voting: false
|
voting: false
|
||||||
gate:
|
gate:
|
||||||
|
@ -63,10 +47,6 @@
|
||||||
- octavia-v2-dsvm-noop-api
|
- octavia-v2-dsvm-noop-api
|
||||||
- octavia-v2-dsvm-noop-api-stable-train
|
- octavia-v2-dsvm-noop-api-stable-train
|
||||||
- octavia-v2-dsvm-noop-api-stable-stein
|
- octavia-v2-dsvm-noop-api-stable-stein
|
||||||
- octavia-v2-dsvm-noop-py2-api-stable-rocky
|
|
||||||
- octavia-v2-dsvm-noop-py2-api-stable-queens
|
|
||||||
- octavia-v2-dsvm-scenario
|
- octavia-v2-dsvm-scenario
|
||||||
- octavia-v2-dsvm-scenario-stable-train
|
- octavia-v2-dsvm-scenario-stable-train
|
||||||
- octavia-v2-dsvm-scenario-stable-stein
|
- octavia-v2-dsvm-scenario-stable-stein
|
||||||
- octavia-v2-dsvm-py2-scenario-stable-rocky
|
|
||||||
- octavia-v2-dsvm-py2-scenario-stable-queens
|
|
||||||
|
|
Loading…
Reference in New Issue