Merge "Force configdrive for ironic jobs"
This commit is contained in:
commit
648ada1f5f
@ -170,6 +170,7 @@
|
||||
export DEVSTACK_GATE_IRONIC=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
||||
export DEVSTACK_GATE_IRONIC_DRIVER={deploy_driver}
|
||||
export TEMPEST_CONCURRENCY=1
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
@ -323,6 +324,7 @@
|
||||
export DEVSTACK_GATE_IRONIC=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
@ -385,6 +387,7 @@
|
||||
export DEVSTACK_GATE_IRONIC=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
@ -439,6 +442,7 @@
|
||||
export DEVSTACK_GATE_IRONIC=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
@ -692,6 +696,7 @@
|
||||
export DEVSTACK_GATE_IRONIC=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
||||
export TEMPEST_CONCURRENCY=2
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
@ -988,6 +993,7 @@
|
||||
export DEVSTACK_GATE_IRONIC=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
||||
export TEMPEST_CONCURRENCY=1
|
||||
export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
|
||||
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
|
||||
@ -1040,6 +1046,7 @@
|
||||
export DEVSTACK_GATE_IRONIC=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
||||
export TEMPEST_CONCURRENCY=1
|
||||
export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
|
||||
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
|
||||
@ -1089,6 +1096,7 @@
|
||||
export DEVSTACK_GATE_IRONIC=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
||||
# The tests will be launched by devstack/exercise.sh
|
||||
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
|
Loading…
Reference in New Issue
Block a user