Clark Boylan 2da6d623e0 Revert "Revert "Update jenkins jobs to optionally allow trusty""
This reverts commit 607b2f2ab4962dec4f4400ecc4687db2b206003a.

Jenkins masters have all had their gearman plugin updating which makes
them register jobs properly.

Conflicts:
	modules/openstack_project/files/zuul/layout.yaml

Change-Id: I3edeb26c9a1d3878b80266ea32d333bd8fc2f67e
2014-06-23 17:05:17 -07:00

66 lines
1.9 KiB
YAML

- job-template:
name: '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}'
node: '{node}'
wrappers:
- timeout:
timeout: 95
fail: true
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=95
export PROJECTS="{injectedrepo} $PROJECTS"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
function gate_hook {{
cd /opt/stack/new/$(basename {injectedrepo})
remaining_time
timeout -s 9 ${{REMAINING_TIME}}m ./tools/run_cross_tests.sh /opt/stack/new/{name} py27
}}
export -f gate_hook
function post_test_hook {{
cd /opt/stack/new/{name}
mv nose_results.html $WORKSPACE/logs
mv testr_results.html.gz $WORKSPACE/logs
mv .testrepository/tmp* $WORKSPACE/logs
mv subunit_log.txt.gz $WORKSPACE/logs
}}
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-group:
name: oslotest-cross-test
injectedlib: oslotest
injectedrepo: openstack/oslotest
jobs:
- '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
pipeline: check
node: 'devstack-precise || devstack-trusty'
branch-designator: ''
branch-override: default
- '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
pipeline: gate
node: 'devstack-precise || devstack-trusty'
branch-designator: ''
branch-override: default