ca3bc6c788
With change Iff5e96bd80b8f165ccc7d6be09b53208613571eb, we do not need to pass DEVSTACK_GATE_TIMEOUT anymore to devstack-gate, instead the value from the build-timeout wrapper is passed. Remove DEVSTACK_GATE_TIMEOUT for jenkins/jobs/d*.yaml Increase timeout for all non-grenade jobs by 5 mins since Iea866e4cc40e149e598f35e010ec855937bdf9ae will use a 10 minute buffer and the internal timeout should stay the same. The grenade jobs already have 10 mins of buffer, so no need adjust the timeout. Note that the builder devstack-virtual-ironic uses devstack-timeout for setting DEVSTACK_GATE_TIMEOUT, remove devstack-timeout as well, it is not needed anymore. Change-Id: Ib9677376758475a4aa34c69b73428877e20556b2
144 lines
4.5 KiB
YAML
144 lines
4.5 KiB
YAML
- job-template:
|
|
name: 'gate-designate-dsvm-{designate-driver}'
|
|
|
|
node: '{node}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 70
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
|
export DEVSTACK_GATE_TEMPEST=1
|
|
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
|
|
export DEVSTACK_GATE_DESIGNATE_DRIVER="{designate-driver}"
|
|
export PROJECTS="openstack/designate $PROJECTS"
|
|
export PROJECTS="openstack/python-designateclient $PROJECTS"
|
|
export PROJECTS="openstack/designate-dashboard $PROJECTS"
|
|
|
|
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
|
# Kilo/Liberty version uses the older 'hooks' approach to adding
|
|
# the Designate plugin
|
|
|
|
function gate_hook {{
|
|
cd /opt/stack/new/designate/contrib/devstack
|
|
./gate_hook.sh
|
|
}}
|
|
export -f gate_hook
|
|
|
|
function pre_test_hook {{
|
|
cd /opt/stack/new/designate/contrib/devstack
|
|
./pre_test_hook.sh
|
|
}}
|
|
export -f pre_test_hook
|
|
|
|
function post_test_hook {{
|
|
cd /opt/stack/new/designate/contrib/devstack
|
|
./post_test_hook.sh
|
|
}}
|
|
export -f post_test_hook
|
|
|
|
else
|
|
# Otherwise, enable the Designate devstack plugin.
|
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
|
|
|
|
function gate_hook {{
|
|
cd /opt/stack/new/designate/devstack/gate
|
|
./gate_hook.sh
|
|
}}
|
|
export -f gate_hook
|
|
|
|
function post_test_hook {{
|
|
cd /opt/stack/new/designate/devstack/gate
|
|
./post_test_hook.sh
|
|
}}
|
|
export -f post_test_hook
|
|
fi
|
|
|
|
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
|
./safe-devstack-vm-gate-wrap.sh
|
|
|
|
publishers:
|
|
- devstack-logs
|
|
- console-log
|
|
|
|
|
|
- job-template:
|
|
name: 'gate-designate-dsvm-{designate-driver}-postgres'
|
|
|
|
node: '{node}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 70
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
|
export DEVSTACK_GATE_TEMPEST=1
|
|
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
|
|
export DEVSTACK_GATE_DESIGNATE_DRIVER="{designate-driver}"
|
|
export DEVSTACK_GATE_POSTGRES=1
|
|
export PROJECTS="openstack/designate $PROJECTS"
|
|
export PROJECTS="openstack/python-designateclient $PROJECTS"
|
|
export PROJECTS="openstack/designate-dashboard $PROJECTS"
|
|
|
|
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
|
# Kilo/Liberty version uses the older 'hooks' approach to adding
|
|
# the Designate plugin
|
|
|
|
function gate_hook {{
|
|
cd /opt/stack/new/designate/contrib/devstack
|
|
./gate_hook.sh
|
|
}}
|
|
export -f gate_hook
|
|
|
|
function pre_test_hook {{
|
|
cd /opt/stack/new/designate/contrib/devstack
|
|
./pre_test_hook.sh
|
|
}}
|
|
export -f pre_test_hook
|
|
|
|
function post_test_hook {{
|
|
cd /opt/stack/new/designate/contrib/devstack
|
|
./post_test_hook.sh
|
|
}}
|
|
export -f post_test_hook
|
|
|
|
else
|
|
# Otherwise, enable the Designate devstack plugin.
|
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
|
|
|
|
function gate_hook {{
|
|
cd /opt/stack/new/designate/devstack/gate
|
|
./gate_hook.sh
|
|
}}
|
|
export -f gate_hook
|
|
|
|
function post_test_hook {{
|
|
cd /opt/stack/new/designate/devstack/gate
|
|
./post_test_hook.sh
|
|
}}
|
|
export -f post_test_hook
|
|
fi
|
|
|
|
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
|
./safe-devstack-vm-gate-wrap.sh
|
|
|
|
publishers:
|
|
- devstack-logs
|
|
- console-log
|