[ussuri][goal] Updates for python 2.7 drop
OpenStack is dropping the py2.7 support in ussuri cycle. openstack-ansible repos only need updates on requirements and tox file. Complete discussion & schedule can be found in - http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html - https://etherpad.openstack.org/p/drop-python2-support Ussuri Communtiy-wide goal: https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html Change-Id: Idf700e627b5c88059762690aec6dc3e3a345a39f
This commit is contained in:
parent
9db7441d99
commit
83ac8bfd6d
@ -29,9 +29,6 @@ gcc
|
|||||||
git-core [platform:dpkg platform:suse]
|
git-core [platform:dpkg platform:suse]
|
||||||
libssl-dev [platform:dpkg]
|
libssl-dev [platform:dpkg]
|
||||||
libffi-dev [platform:dpkg]
|
libffi-dev [platform:dpkg]
|
||||||
python2.7 [platform:dpkg]
|
|
||||||
python-apt [platform:dpkg]
|
|
||||||
python-dev [platform:dpkg]
|
|
||||||
python3 [platform:dpkg]
|
python3 [platform:dpkg]
|
||||||
python3-apt [platform:dpkg]
|
python3-apt [platform:dpkg]
|
||||||
python3-dev [platform:dpkg]
|
python3-dev [platform:dpkg]
|
||||||
@ -41,14 +38,14 @@ gcc-c++ [platform:rpm]
|
|||||||
git [platform:rpm !platform:suse]
|
git [platform:rpm !platform:suse]
|
||||||
libffi-devel [platform:rpm]
|
libffi-devel [platform:rpm]
|
||||||
openssl-devel [platform:rpm]
|
openssl-devel [platform:rpm]
|
||||||
python-devel [platform:rpm]
|
python3-devel [platform:rpm]
|
||||||
python2-dnf [platform:fedora]
|
python3-dnf [platform:fedora]
|
||||||
|
|
||||||
# Base requirements for Gentoo
|
# Base requirements for Gentoo
|
||||||
git [platform:gentoo]
|
git [platform:gentoo]
|
||||||
|
|
||||||
# For SELinux
|
# For SELinux
|
||||||
libselinux-python [platform:redhat]
|
libselinux-python [platform:redhat]
|
||||||
libsemanage-python [platform:redhat]
|
libsemanage-python [platform:redhat]
|
||||||
|
|
||||||
# Required for compressing collected log files in CI
|
# Required for compressing collected log files in CI
|
||||||
|
@ -35,11 +35,23 @@
|
|||||||
- misc
|
- misc
|
||||||
- V-71985
|
- V-71985
|
||||||
|
|
||||||
|
# NOTE(noonedeadpunk): We run this twice because of the ansible bug:
|
||||||
|
# https://github.com/ansible/ansible/issues/68680
|
||||||
# This returns an exit code of 0 if it's running, 3 if it's masked.
|
# This returns an exit code of 0 if it's running, 3 if it's masked.
|
||||||
- name: V-71993 - The x86 Ctrl-Alt-Delete key sequence must be disabled
|
- name: V-71993 - The x86 Ctrl-Alt-Delete key sequence must be disabled
|
||||||
systemd:
|
systemd:
|
||||||
name: ctrl-alt-del.target
|
name: ctrl-alt-del.target
|
||||||
enabled: no
|
enabled: no
|
||||||
|
when:
|
||||||
|
- security_rhel7_disable_ctrl_alt_delete | bool
|
||||||
|
tags:
|
||||||
|
- high
|
||||||
|
- misc
|
||||||
|
- V-71993
|
||||||
|
|
||||||
|
- name: V-71993 - The x86 Ctrl-Alt-Delete key sequence must be disabled
|
||||||
|
systemd:
|
||||||
|
name: ctrl-alt-del.target
|
||||||
masked: yes
|
masked: yes
|
||||||
daemon_reload: yes
|
daemon_reload: yes
|
||||||
when:
|
when:
|
||||||
|
@ -16,6 +16,9 @@
|
|||||||
- name: Playbook for role testing
|
- name: Playbook for role testing
|
||||||
hosts: localhost
|
hosts: localhost
|
||||||
pre_tasks:
|
pre_tasks:
|
||||||
|
- name: Set ansible_python_interpreter
|
||||||
|
set_fact:
|
||||||
|
ansible_python_interpreter: "/usr/bin/{{ (ansible_distribution == 'CentOS' and ansible_distribution_version is version('8', '<')) | ternary('python2', 'python3') }}"
|
||||||
- name: Ensure apt cache is updated before testing
|
- name: Ensure apt cache is updated before testing
|
||||||
apt:
|
apt:
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
13
tox.ini
13
tox.ini
@ -1,10 +1,12 @@
|
|||||||
[tox]
|
[tox]
|
||||||
minversion = 2.0
|
minversion = 3.1
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
envlist = docs,linters,functional
|
envlist = docs,linters,functional
|
||||||
|
ignore_basepython_conflict = True
|
||||||
|
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
basepython = python3
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command =
|
install_command =
|
||||||
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||||
@ -31,7 +33,6 @@ setenv =
|
|||||||
|
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands =
|
commands =
|
||||||
bash -c "rm -rf doc/build"
|
bash -c "rm -rf doc/build"
|
||||||
@ -41,7 +42,6 @@ commands =
|
|||||||
sphinx-build -W -b html doc/source doc/build/html
|
sphinx-build -W -b html doc/source doc/build/html
|
||||||
|
|
||||||
[testenv:pdf-docs]
|
[testenv:pdf-docs]
|
||||||
basepython = python3
|
|
||||||
deps = {[testenv:docs]deps}
|
deps = {[testenv:docs]deps}
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
make
|
make
|
||||||
@ -57,7 +57,6 @@ allow-long-titles=1
|
|||||||
|
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands =
|
commands =
|
||||||
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
@ -65,13 +64,11 @@ commands =
|
|||||||
|
|
||||||
# environment used by the -infra templated docs job
|
# environment used by the -infra templated docs job
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
{posargs}
|
{posargs}
|
||||||
|
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
bash -c "{toxinidir}/tests/common/test-pep8.sh"
|
bash -c "{toxinidir}/tests/common/test-pep8.sh"
|
||||||
|
|
||||||
@ -84,19 +81,16 @@ ignore=F403
|
|||||||
|
|
||||||
|
|
||||||
[testenv:bashate]
|
[testenv:bashate]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
bash -c "{toxinidir}/tests/common/test-bashate.sh"
|
bash -c "{toxinidir}/tests/common/test-bashate.sh"
|
||||||
|
|
||||||
|
|
||||||
[testenv:ansible-syntax]
|
[testenv:ansible-syntax]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
|
bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
|
||||||
|
|
||||||
|
|
||||||
[testenv:ansible-lint]
|
[testenv:ansible-lint]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
|
bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
|
||||||
|
|
||||||
@ -110,7 +104,6 @@ commands =
|
|||||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
|
bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
|
||||||
{[testenv:pep8]commands}
|
{[testenv:pep8]commands}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user