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

126 lines
2.8 KiB
YAML

- job-template:
name: 'gate-rally-install-{node}'
node: '{node}'
builders:
- link-logs
- gerrit-git-prep
- shell: "tests_ci/test_install.sh"
publishers:
- console-log
- publisher:
name: rally-plot
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$LOG_PATH'
source: 'rally-plot/**'
keep-hierarchy: true
copy-after-failure: true
- builder:
name: devstack-rally-gate
builders:
- link-logs
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="stackforge/rally $PROJECTS"
export ENABLED_SERVICES=rally
export DEVSTACK_GATE_NEUTRON={neutron}
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_TIMEOUT=120
export RALLY_SCENARIO={scenario}
function pre_test_hook {{
# Install rally-devstack integration
cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack
}}
export -f pre_test_hook
function post_test_hook {{
$BASE/new/rally/tests_ci/rally-gate.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
- job-template:
name: 'check-rally-dsvm-{name}'
node: 'devstack-precise || devstack-trusty'
wrappers:
- timeout:
timeout: 125
fail: true
- timestamps
builders:
- devstack-rally-gate:
scenario: '{name}'
neutron: '0'
publishers:
- devstack-logs
- console-log
- rally-plot
- job-template:
name: 'check-rally-dsvm-neutron-{name}'
node: 'devstack-precise || devstack-trusty'
wrappers:
- timeout:
timeout: 125
fail: true
- timestamps
builders:
- devstack-rally-gate:
scenario: '{name}-neutron'
neutron: '1'
publishers:
- devstack-logs
- console-log
- rally-plot
- job:
name: 'check-rally-dsvm-cli'
node: 'devstack-precise || devstack-trusty'
builders:
- link-logs
- devstack-checkout
- shell: |
#/bin/bash -xe
export PROJECTS="stackforge/rally $PROJECTS"
export ENABLED_SERVICES=rally
function post_test_hook {
cd $BASE/new/rally
sudo -H -u stack tox -ecli -v
}
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: rally-jobs
jobs:
- 'check-rally-dsvm-{name}'
- 'check-rally-dsvm-neutron-{name}'