CI: Return to openstack-python3-jobs, fix pep8 failures
Since I8f5338b7eee31f1b8bc3e783d10666e3092a6540 we have not been running pep8 jobs in CI. This change fixes the issues introduced since then, returning to use the openstack-python3-jobs template, which includes openstack-tox-pep8. Change-Id: Ie15019f91b9e7b7f8cf97b628886f6b0beeb24fa
This commit is contained in:
parent
c726492e49
commit
610433b11b
@ -731,7 +731,8 @@ class SeedServiceDeploy(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
|||||||
playbooks = _build_playbook_list(
|
playbooks = _build_playbook_list(
|
||||||
"seed-manage-containers")
|
"seed-manage-containers")
|
||||||
extra_vars = {"kayobe_action": "deploy"}
|
extra_vars = {"kayobe_action": "deploy"}
|
||||||
self.run_kayobe_playbooks(parsed_args, playbooks, extra_vars=extra_vars)
|
self.run_kayobe_playbooks(parsed_args, playbooks,
|
||||||
|
extra_vars=extra_vars)
|
||||||
self.generate_kolla_ansible_config(parsed_args, service_config=False,
|
self.generate_kolla_ansible_config(parsed_args, service_config=False,
|
||||||
bifrost_config=True)
|
bifrost_config=True)
|
||||||
|
|
||||||
@ -740,7 +741,9 @@ class SeedServiceDeploy(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
|||||||
"seed-credentials",
|
"seed-credentials",
|
||||||
"seed-introspection-rules",
|
"seed-introspection-rules",
|
||||||
"dell-switch-bmp")
|
"dell-switch-bmp")
|
||||||
self.run_kayobe_playbooks(parsed_args, playbooks, extra_vars=extra_vars)
|
self.run_kayobe_playbooks(parsed_args, playbooks,
|
||||||
|
extra_vars=extra_vars)
|
||||||
|
|
||||||
|
|
||||||
class SeedServiceDestroy(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
class SeedServiceDestroy(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
||||||
Command):
|
Command):
|
||||||
@ -762,13 +765,15 @@ class SeedServiceDestroy(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
|||||||
self.generate_kolla_ansible_config(parsed_args, service_config=False,
|
self.generate_kolla_ansible_config(parsed_args, service_config=False,
|
||||||
bifrost_config=False)
|
bifrost_config=False)
|
||||||
extra_args = ["--yes-i-really-really-mean-it"]
|
extra_args = ["--yes-i-really-really-mean-it"]
|
||||||
self.run_kolla_ansible_seed(parsed_args, "destroy", extra_args=extra_args)
|
self.run_kolla_ansible_seed(parsed_args, "destroy",
|
||||||
|
extra_args=extra_args)
|
||||||
|
|
||||||
extra_vars = {"kayobe_action": "destroy"}
|
extra_vars = {"kayobe_action": "destroy"}
|
||||||
playbooks = _build_playbook_list(
|
playbooks = _build_playbook_list(
|
||||||
"seed-manage-containers",
|
"seed-manage-containers",
|
||||||
"docker-registry")
|
"docker-registry")
|
||||||
self.run_kayobe_playbooks(parsed_args, playbooks, extra_vars=extra_vars)
|
self.run_kayobe_playbooks(parsed_args, playbooks,
|
||||||
|
extra_vars=extra_vars)
|
||||||
|
|
||||||
def get_parser(self, prog_name):
|
def get_parser(self, prog_name):
|
||||||
parser = super(SeedServiceDestroy, self).get_parser(prog_name)
|
parser = super(SeedServiceDestroy, self).get_parser(prog_name)
|
||||||
@ -779,6 +784,7 @@ class SeedServiceDestroy(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
|||||||
"permanently destroy all services and data.")
|
"permanently destroy all services and data.")
|
||||||
return parser
|
return parser
|
||||||
|
|
||||||
|
|
||||||
class SeedServiceUpgrade(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
class SeedServiceUpgrade(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
||||||
Command):
|
Command):
|
||||||
"""Upgrade the seed services.
|
"""Upgrade the seed services.
|
||||||
@ -800,7 +806,8 @@ class SeedServiceUpgrade(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
|||||||
playbooks = _build_playbook_list(
|
playbooks = _build_playbook_list(
|
||||||
"seed-manage-containers")
|
"seed-manage-containers")
|
||||||
extra_vars = {"kayobe_action": "deploy"}
|
extra_vars = {"kayobe_action": "deploy"}
|
||||||
self.run_kayobe_playbooks(parsed_args, playbooks, extra_vars=extra_vars)
|
self.run_kayobe_playbooks(parsed_args, playbooks,
|
||||||
|
extra_vars=extra_vars)
|
||||||
self.generate_kolla_ansible_config(parsed_args, service_config=False,
|
self.generate_kolla_ansible_config(parsed_args, service_config=False,
|
||||||
bifrost_config=True)
|
bifrost_config=True)
|
||||||
|
|
||||||
@ -1896,6 +1903,7 @@ class NetworkConnectivityCheck(KayobeAnsibleMixin, VaultMixin, Command):
|
|||||||
playbooks = _build_playbook_list("network-connectivity")
|
playbooks = _build_playbook_list("network-connectivity")
|
||||||
self.run_kayobe_playbooks(parsed_args, playbooks)
|
self.run_kayobe_playbooks(parsed_args, playbooks)
|
||||||
|
|
||||||
|
|
||||||
class BaremetalComputeRegister(KayobeAnsibleMixin, VaultMixin, Command):
|
class BaremetalComputeRegister(KayobeAnsibleMixin, VaultMixin, Command):
|
||||||
"""Register baremetal compute nodes in Ironic."""
|
"""Register baremetal compute nodes in Ironic."""
|
||||||
|
|
||||||
@ -1915,7 +1923,8 @@ class BaremetalComputeInspect(KayobeAnsibleMixin, VaultMixin, Command):
|
|||||||
self.run_kayobe_playbooks(parsed_args, playbooks)
|
self.run_kayobe_playbooks(parsed_args, playbooks)
|
||||||
|
|
||||||
|
|
||||||
class BaremetalComputeIntrospectionDataSave(KayobeAnsibleMixin, VaultMixin, Command):
|
class BaremetalComputeIntrospectionDataSave(KayobeAnsibleMixin, VaultMixin,
|
||||||
|
Command):
|
||||||
"""Save hardware introspection data for the baremetal compute nodes.
|
"""Save hardware introspection data for the baremetal compute nodes.
|
||||||
|
|
||||||
Save hardware introspection data from the overcloud's ironic inspector
|
Save hardware introspection data from the overcloud's ironic inspector
|
||||||
|
@ -748,6 +748,7 @@ def net_ovs_veths(context, names, inventory_hostname=None):
|
|||||||
for veth in veths
|
for veth in veths
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@jinja2.pass_context
|
@jinja2.pass_context
|
||||||
def net_physical_interface(context, name, inventory_hostname=None):
|
def net_physical_interface(context, name, inventory_hostname=None):
|
||||||
"""Return a list of bridge ports, bond slaves or a direct interface name
|
"""Return a list of bridge ports, bond slaves or a direct interface name
|
||||||
@ -762,6 +763,7 @@ def net_physical_interface(context, name, inventory_hostname=None):
|
|||||||
else:
|
else:
|
||||||
return [net_attr(context, name, 'interface', inventory_hostname)]
|
return [net_attr(context, name, 'interface', inventory_hostname)]
|
||||||
|
|
||||||
|
|
||||||
def get_filters():
|
def get_filters():
|
||||||
return {
|
return {
|
||||||
'net_attr': net_attr,
|
'net_attr': net_attr,
|
||||||
|
@ -205,7 +205,8 @@ class TestNetworks(BaseNetworksTest):
|
|||||||
self.context, "net3")
|
self.context, "net3")
|
||||||
|
|
||||||
def test_physical_interface_bond(self):
|
def test_physical_interface_bond(self):
|
||||||
self._update_context({"net6_interface": "bond0", "net6_bond_slaves": ["eth3", "eth4"]})
|
self._update_context({"net6_interface": "bond0",
|
||||||
|
"net6_bond_slaves": ["eth3", "eth4"]})
|
||||||
interface = networks.net_physical_interface(self.context, "net6")
|
interface = networks.net_physical_interface(self.context, "net6")
|
||||||
expected = ['eth3', 'eth4']
|
expected = ['eth3', 'eth4']
|
||||||
self.assertEqual(expected, interface)
|
self.assertEqual(expected, interface)
|
||||||
@ -219,4 +220,3 @@ class TestNetworks(BaseNetworksTest):
|
|||||||
interface = networks.net_physical_interface(self.context, "net1")
|
interface = networks.net_physical_interface(self.context, "net1")
|
||||||
expected = ['eth0']
|
expected = ['eth0']
|
||||||
self.assertEqual(expected, interface)
|
self.assertEqual(expected, interface)
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
queue: kayobe
|
queue: kayobe
|
||||||
templates:
|
templates:
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
- openstack-python3-jobs
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
check:
|
check:
|
||||||
@ -28,11 +29,6 @@
|
|||||||
- kayobe-seed-vm-ubuntu-jammy
|
- kayobe-seed-vm-ubuntu-jammy
|
||||||
- kayobe-infra-vm-rocky9
|
- kayobe-infra-vm-rocky9
|
||||||
- kayobe-infra-vm-ubuntu-jammy
|
- kayobe-infra-vm-ubuntu-jammy
|
||||||
- openstack-tox-py39
|
|
||||||
- openstack-tox-py310
|
|
||||||
- openstack-tox-py311
|
|
||||||
- openstack-tox-py312:
|
|
||||||
voting: false
|
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- kayobe-tox-ansible-syntax
|
- kayobe-tox-ansible-syntax
|
||||||
|
Loading…
x
Reference in New Issue
Block a user