Merge "Merge jobs"
This commit is contained in:
commit
6b0614823f
|
@ -46,8 +46,8 @@
|
||||||
ironic-inspector-dhcp: True
|
ironic-inspector-dhcp: True
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-inspector-non-standalone-tempest
|
name: ironic-inspector-tempest-managed-non-standalone
|
||||||
description: Execute python3 tempest tests for ironic-inspector running in non-standalone mode
|
description: The boot is managed by ironic, ironic-inspector runs in non-standalone mode.
|
||||||
parent: ironic-inspector-base
|
parent: ironic-inspector-base
|
||||||
vars:
|
vars:
|
||||||
tempest_test_timeout: 3600
|
tempest_test_timeout: 3600
|
||||||
|
@ -56,6 +56,9 @@
|
||||||
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
||||||
IRONIC_INSPECTOR_STANDALONE: False
|
IRONIC_INSPECTOR_STANDALONE: False
|
||||||
IRONIC_TEMPEST_BUILD_TIMEOUT: 3600
|
IRONIC_TEMPEST_BUILD_TIMEOUT: 3600
|
||||||
|
IRONIC_INSPECTOR_TEMPEST_DISCOVERY_TIMEOUT: 1200
|
||||||
|
IRONIC_INSPECTOR_MANAGED_BOOT: True
|
||||||
|
IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK: ''
|
||||||
devstack_services:
|
devstack_services:
|
||||||
s-account: True
|
s-account: True
|
||||||
s-container: True
|
s-container: True
|
||||||
|
@ -81,16 +84,6 @@
|
||||||
IRONIC_INSPECTOR_DHCP_FILTER: dnsmasq
|
IRONIC_INSPECTOR_DHCP_FILTER: dnsmasq
|
||||||
IRONIC_INSPECTOR_INTROSPECTION_DATA_STORE: database
|
IRONIC_INSPECTOR_INTROSPECTION_DATA_STORE: database
|
||||||
|
|
||||||
- job:
|
|
||||||
name: ironic-inspector-tempest-managed
|
|
||||||
description: A job with boot managed by ironic
|
|
||||||
parent: ironic-inspector-base
|
|
||||||
vars:
|
|
||||||
devstack_localrc:
|
|
||||||
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
|
||||||
IRONIC_INSPECTOR_MANAGED_BOOT: True
|
|
||||||
IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK: ''
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
# Security testing for known issues
|
# Security testing for known issues
|
||||||
name: ironic-inspector-tox-bandit
|
name: ironic-inspector-tox-bandit
|
||||||
|
@ -186,3 +179,7 @@
|
||||||
- ^setup.cfg$
|
- ^setup.cfg$
|
||||||
- ^tools/.*$
|
- ^tools/.*$
|
||||||
- ^tox.ini$
|
- ^tox.ini$
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: ironic-inspector-tempest-managed
|
||||||
|
parent: ironic-inspector-tempest-managed-non-standalone
|
||||||
|
|
|
@ -11,11 +11,7 @@
|
||||||
- ironic-inspector-grenade
|
- ironic-inspector-grenade
|
||||||
- ironic-inspector-tempest
|
- ironic-inspector-tempest
|
||||||
- ironic-inspector-tempest-discovery
|
- ironic-inspector-tempest-discovery
|
||||||
- ironic-inspector-tempest-managed
|
- ironic-inspector-tempest-managed-non-standalone
|
||||||
# NOTE (rpittau) sadly temporary disabling the non-standalone-tempest
|
|
||||||
# job until we got it fixed
|
|
||||||
- ironic-inspector-non-standalone-tempest:
|
|
||||||
voting: false
|
|
||||||
- openstack-tox-functional-py36
|
- openstack-tox-functional-py36
|
||||||
- bifrost-integration-tinyipa-ubuntu-bionic:
|
- bifrost-integration-tinyipa-ubuntu-bionic:
|
||||||
voting: false
|
voting: false
|
||||||
|
@ -27,5 +23,5 @@
|
||||||
- ironic-inspector-grenade
|
- ironic-inspector-grenade
|
||||||
- ironic-inspector-tempest
|
- ironic-inspector-tempest
|
||||||
- ironic-inspector-tempest-discovery
|
- ironic-inspector-tempest-discovery
|
||||||
- ironic-inspector-tempest-managed
|
- ironic-inspector-tempest-managed-non-standalone
|
||||||
- openstack-tox-functional-py36
|
- openstack-tox-functional-py36
|
||||||
|
|
Loading…
Reference in New Issue