065a80d9c2
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/[n-z]*.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. Adjust timeout for gate-rally-dsvm-cue-{broker}, the removed variable in builder devstack-cue-rally-gate was 100, so set timeout to 110. Change-Id: I623fff029fb2e0acdbe2bf93a13af02547062a71
114 lines
4.6 KiB
YAML
114 lines
4.6 KiB
YAML
- job-template:
|
|
name: '{pipeline}-dsvm-nodepool{job-suffix}'
|
|
node: '{node}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 70
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
# Disable tempest as nodepool is talking to the cloud not tempest.
|
|
export DEVSTACK_GATE_TEMPEST=0
|
|
# Use neutron as the public clouds in use are neutron based.
|
|
export DEVSTACK_GATE_NEUTRON=1
|
|
# The nodepool process needs sudo rights in order to
|
|
# perform dib image builds
|
|
export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
|
|
# Override so we get a bare minimum set of base compute services
|
|
# required to have nodepool function.
|
|
OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy
|
|
# n-obj has been removed from mitaka
|
|
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
|
OVERRIDE_ENABLED_SERVICES+=,n-obj,
|
|
fi
|
|
export OVERRIDE_ENABLED_SERVICES
|
|
export BRANCH_OVERRIDE={branch-override}
|
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
fi
|
|
# Because we are testing a non standard project, add the
|
|
# our project repository. This makes zuul do the right
|
|
# reference magic for testing changes.
|
|
export PROJECTS="openstack-infra/nodepool $PROJECTS"
|
|
# note the actual url here is somewhat irrelevant because it
|
|
# caches in nodepool, however make it a valid url for
|
|
# documentation purposes.
|
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin nodepool git://git.openstack.org/openstack-infra/nodepool"
|
|
|
|
function post_test_hook {{
|
|
/opt/stack/new/nodepool/tools/check_devstack_plugin.sh
|
|
}}
|
|
export -f post_test_hook
|
|
|
|
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: '{pipeline}-dsvm-nodepool-src-shade{job-suffix}'
|
|
node: '{node}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 70
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
# Disable tempest as nodepool is talking to the cloud not tempest.
|
|
export DEVSTACK_GATE_TEMPEST=0
|
|
# Use neutron as the public clouds in use are neutron based.
|
|
export DEVSTACK_GATE_NEUTRON=1
|
|
# The nodepool process needs sudo rights in order to
|
|
# perform dib image builds
|
|
export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
|
|
# Override so we get a bare minimum set of base compute services
|
|
# required to have nodepool function.
|
|
OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy
|
|
# n-obj has been removed from mitaka
|
|
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
|
OVERRIDE_ENABLED_SERVICES+=,n-obj,
|
|
fi
|
|
export OVERRIDE_ENABLED_SERVICES
|
|
export BRANCH_OVERRIDE={branch-override}
|
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
fi
|
|
# Because we are testing a non standard project, add the
|
|
# our project repository. This makes zuul do the right
|
|
# reference magic for testing changes.
|
|
export PROJECTS="openstack-infra/nodepool $PROJECTS"
|
|
export PROJECTS="openstack-infra/shade $PROJECTS"
|
|
# note the actual url here is somewhat irrelevant because it
|
|
# caches in nodepool, however make it a valid url for
|
|
# documentation purposes.
|
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin nodepool git://git.openstack.org/openstack-infra/nodepool"
|
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=shade"
|
|
|
|
function post_test_hook {{
|
|
/opt/stack/new/nodepool/tools/check_devstack_plugin.sh
|
|
}}
|
|
export -f post_test_hook
|
|
|
|
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
|