Browse Source

[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
changes/29/723129/6
Ghanshyam Mann 1 year ago
parent
commit
a97deefcb3
4 changed files with 6 additions and 73 deletions
  1. +1
    -2
      doc/requirements.txt
  2. +5
    -11
      setup.cfg
  3. +0
    -40
      zuul.d/jobs.yaml
  4. +0
    -20
      zuul.d/projects.yaml

+ 1
- 2
doc/requirements.txt View File

@ -3,8 +3,7 @@
# process, which may cause wedges in the gate later.
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;python_version>='3.4' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2,!=2.1.0; # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
# releasenotes


+ 5
- 11
setup.cfg View File

@ -6,6 +6,7 @@ description-file =
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/octavia-tempest-plugin/latest/
python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@ -13,10 +14,11 @@ 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 :: Implementation :: CPython
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
[global]
setup-hooks =
@ -26,14 +28,6 @@ setup-hooks =
packages =
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]
directory = octavia_tempest_plugin/locale
domain = octavia_tempest_plugin


+ 0
- 40
zuul.d/jobs.yaml View File

@ -417,16 +417,6 @@
parent: octavia-v2-dsvm-noop-api
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:
name: octavia-v2-dsvm-scenario
parent: octavia-dsvm-live-base
@ -484,16 +474,6 @@
parent: octavia-v2-dsvm-scenario
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
- job:
name: octavia-v2-dsvm-scenario-two-node
@ -652,16 +632,6 @@
parent: octavia-v2-dsvm-spare-pool
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:
name: octavia-v2-dsvm-cinder-amphora
parent: octavia-v2-dsvm-scenario
@ -770,16 +740,6 @@
load_balancer:
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:
name: octavia-v2-act-stdby-dsvm-scenario
parent: octavia-dsvm-live-base


+ 0
- 20
zuul.d/projects.yaml View File

@ -11,23 +11,15 @@
- octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-api-stable-train
- 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-stable-train
- 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:
voting: false
- octavia-v2-dsvm-scenario-centos-8:
voting: false
- octavia-v2-act-stdby-dsvm-scenario-two-node:
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:
voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-train:
@ -40,20 +32,12 @@
voting: false
- octavia-v2-dsvm-tls-barbican-stable-stein:
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:
voting: false
- octavia-v2-dsvm-spare-pool-stable-train:
voting: false
- octavia-v2-dsvm-spare-pool-stable-stein:
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:
voting: false
gate:
@ -63,10 +47,6 @@
- octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-api-stable-train
- 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-stable-train
- octavia-v2-dsvm-scenario-stable-stein
- octavia-v2-dsvm-py2-scenario-stable-rocky
- octavia-v2-dsvm-py2-scenario-stable-queens

Loading…
Cancel
Save