0af9b2c178
Between the Icehouse and Juno releases, OpenStack changed its supported Ubuntu LTS platform from Precise to Trusty. In support of continuing testing stable/icehouse and prior branches on Precise while starting to test newer branches on Trusty, a branch-based decision tree was introduced into our Zuul configuration by way of complex parameter functions with an ever growing list of regular expression matches on job names. Now that Icehouse is EOL (in fact, Juno is too) this simply adds unnecessary complexity and an attractive nuisance for cargo-cult copying into new job and job-template definitions which don't even need it. In preparation to remove the associated parameter functions, get rid of multiple labels in all jobs and set them to whatever label Zuul would ultimately select. This change touches a vast number, possibly a majority, of our jobs and so manual jenkins-jobs updates on all Jenkins masters will be needed after this merges, before it's safe to approve the corresponding Zuul configuration cleanup. Change-Id: Ic952ee02da2c77fe2ace81c4e2fa87531be6119c
95 lines
2.5 KiB
YAML
95 lines
2.5 KiB
YAML
- job:
|
|
name: gate-tempest-dsvm-docker
|
|
node: devstack-trusty
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 65
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
function gate_hook {
|
|
$BASE/new/nova-docker/contrib/devstack/gate_hook.sh
|
|
}
|
|
|
|
export -f gate_hook
|
|
|
|
function pre_test_hook {
|
|
if [ -f $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh ] ; then
|
|
$BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh
|
|
fi
|
|
}
|
|
|
|
export -f pre_test_hook
|
|
|
|
function post_test_hook {
|
|
if [ -f $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh ] ; then
|
|
$BASE/new/nova-docker/contrib/devstack/post_test_hook.sh
|
|
fi
|
|
}
|
|
|
|
export -f post_test_hook
|
|
|
|
export PYTHONUNBUFFERED=true
|
|
export DEVSTACK_GATE_TIMEOUT=60
|
|
export PROJECTS="openstack/nova-docker $PROJECTS"
|
|
|
|
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:
|
|
name: gate-tempest-dsvm-docker-centos7
|
|
node: 'devstack-centos7'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 65
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
function gate_hook {
|
|
$BASE/new/nova-docker/contrib/devstack/gate_hook.sh
|
|
}
|
|
|
|
export -f gate_hook
|
|
|
|
function pre_test_hook {
|
|
if [ -f $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh ] ; then
|
|
$BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh
|
|
fi
|
|
}
|
|
|
|
export -f pre_test_hook
|
|
|
|
function post_test_hook {
|
|
if [ -f $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh ] ; then
|
|
$BASE/new/nova-docker/contrib/devstack/post_test_hook.sh
|
|
fi
|
|
}
|
|
|
|
export -f post_test_hook
|
|
export PYTHONUNBUFFERED=true
|
|
export DEVSTACK_GATE_TIMEOUT=60
|
|
export PROJECTS="openstack/nova-docker $PROJECTS"
|
|
|
|
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
|